rebase

anoma · Feb 7, 2023 · 2793ed0 · 2793ed0
1 parent e2892f7
commit 2793ed0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs
@@ -1643,6 +1643,7 @@ pub mod args {
     const DATA_PATH: Arg<PathBuf> = arg("data-path");
     const DECRYPT: ArgFlag = flag("decrypt");
     const DONT_ARCHIVE: ArgFlag = flag("dont-archive");
+    const DUMP_TX: ArgFlag = flag("dump-tx");
     const DRY_RUN_TX: ArgFlag = flag("dry-run");
     const OFFLINE_TX: ArgFlag = flag("offline-tx");
     const EPOCH: ArgOpt<Epoch> = arg_opt("epoch");

diff --git a/apps/src/lib/client/signing.rs b/apps/src/lib/client/signing.rs
@@ -8,7 +8,7 @@ use borsh::BorshSerialize;
 use namada::ledger::parameters::storage as parameter_storage;
 use namada::proto::Tx;
 use namada::types::address::{Address, ImplicitAddress};
-use namada::types::hash::Hash;
+
 use namada::types::key::*;
 use namada::types::storage::Epoch;
 use namada::types::token;
@@ -244,7 +244,7 @@ pub async fn sign_tx_multisignature(
         }
     };
 
-    let epoch = rpc::query_epoch(args::Query {
+    let epoch = rpc::query_and_print_epoch(args::Query {
         ledger_address: args.ledger_address.clone(),
     })
     .await;

diff --git a/tests/src/vm_host_env/tx.rs b/tests/src/vm_host_env/tx.rs
@@ -189,7 +189,8 @@ impl TestTxEnv {
         index: u64,
     ) {
         let storage_key = key::pk_key(address, index);
-        self.storage
+        self.wl_storage
+            .storage
             .write(&storage_key, public_key.try_to_vec().unwrap())
             .unwrap();
     }
@@ -201,7 +202,8 @@ impl TestTxEnv {
         threshold: u64,
     ) {
         let storage_key = key::threshold_key(address);
-        self.storage
+        self.wl_storage
+            .storage
             .write(&storage_key, threshold.try_to_vec().unwrap())
             .unwrap();
     }

diff --git a/tx_prelude/src/lib.rs b/tx_prelude/src/lib.rs
@@ -7,7 +7,6 @@
 #![deny(rustdoc::private_intra_doc_links)]
 
 pub mod account;
-pub mod governance;
 pub mod ibc;
 pub mod key;
 pub mod proof_of_stake;

diff --git a/tx_prelude/src/proof_of_stake.rs b/tx_prelude/src/proof_of_stake.rs
@@ -1,6 +1,6 @@
 //! Proof of Stake system integration with functions for transactions
 
-use namada_core::types::key::common;
+
 use namada_core::types::transaction::{InitAccount, InitValidator};
 use namada_core::types::{key, token};
 pub use namada_proof_of_stake::parameters::PosParams;

diff --git a/wasm/wasm_source/src/vp_user.rs b/wasm/wasm_source/src/vp_user.rs
@@ -179,12 +179,11 @@ fn validate_tx(
 
 #[cfg(test)]
 mod tests {
-    use address::testing::arb_non_internal_address;
-    use namada::ledger::pos::{GenesisValidator, PosParams};
-    use namada::types::storage::Epoch;
     use std::collections::HashMap;
 
     use address::testing::arb_non_internal_address;
+    use namada::ledger::pos::{GenesisValidator, PosParams};
+    use namada::types::storage::Epoch;
     // Use this as `#[test]` annotation to enable logging
     use namada_tests::log::test;
     use namada_tests::native_vp::pos::init_pos;