Cleans up ferve-related things

anoma · May 14, 2024 · 4389dd5 · 4389dd5
1 parent 4ed6229
commit 4389dd5
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 295 deletions.
diff --git a/crates/sdk/src/lib.rs b/crates/sdk/src/lib.rs
@@ -803,7 +803,7 @@ pub mod testing {
         BecomeValidator, Bond, CommissionChange, ConsensusKeyChange,
         MetaDataChange, Redelegation, Unbond, Withdraw,
     };
-    use namada_tx::data::{DecryptedTx, Fee, TxType, WrapperTx};
+    use namada_tx::data::{Fee, TxType, WrapperTx};
     use proptest::prelude::{Just, Strategy};
     use proptest::{arbitrary, collection, option, prop_compose, prop_oneof};
     use prost::Message;
@@ -966,16 +966,6 @@ pub mod testing {
         }
     }
 
-    prop_compose! {
-        // Generate an arbitrary decrypted transaction
-        pub fn arb_decrypted_tx()(decrypted_tx in prop_oneof![
-            Just(DecryptedTx::Decrypted),
-            Just(DecryptedTx::Undecryptable),
-        ]) -> DecryptedTx {
-            decrypted_tx
-        }
-    }
-
     prop_compose! {
         // Generate an arbitrary transaction type
         pub fn arb_tx_type()(tx_type in prop_oneof![

diff --git a/crates/tests/src/integration/masp.rs b/crates/tests/src/integration/masp.rs
@@ -1794,7 +1794,7 @@ fn multiple_unfetched_txs_same_block() -> Result<()> {
     for bytes in txs_bytes {
         let mut tx = namada::tx::Tx::deserialize(&bytes).unwrap();
         tx.add_wrapper(
-            namada::tx::data::wrapper_tx::Fee {
+            namada::tx::data::wrapper::Fee {
                 amount_per_gas_unit: DenominatedAmount::native(1.into()),
                 token: native_token.clone(),
             },

diff --git a/crates/tx/src/data/decrypted.rs b/crates/tx/src/data/decrypted.rs
diff --git a/crates/tx/src/data/mod.rs b/crates/tx/src/data/mod.rs
@@ -1,8 +1,5 @@
 //! Data-Types that are used in transactions.
 
-/// txs that contain decrypted payloads or assertions of
-/// non-decryptability
-pub mod decrypted;
 pub mod eval_vp;
 /// txs to manage pgf
 pub mod pgf;
@@ -18,7 +15,6 @@ use std::fmt::{self, Display};
 use std::str::FromStr;
 
 use bitflags::bitflags;
-pub use decrypted::*;
 use namada_core::address::Address;
 use namada_core::borsh::{
     BorshDeserialize, BorshSchema, BorshSerialize, BorshSerializeExt,