Fixing conflicts from rebasing

anoma · May 27, 2024 · 103a249 · 103a249
1 parent afaef35
commit 103a249
Show file tree

Hide file tree

Showing 12 changed files with 316 additions and 270 deletions.
diff --git a/crates/apps_lib/src/client/masp.rs b/crates/apps_lib/src/client/masp.rs
@@ -40,7 +40,7 @@ pub async fn syncing<
     let logger = CliProgressTracker::new(io);
     let sync = async move {
         shielded
-            .fetch::<_, _, _, LedgerMaspClient<C>>(
+            .fetch::<_, _, _, LedgerMaspClient<'_, C>>(
                 client,
                 &logger,
                 RetryStrategy::Forever,

diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs
@@ -1191,7 +1191,7 @@ fn parameters(c: &mut Criterion) {
                 let mut tx = Tx::from_type(namada::tx::data::TxType::Raw);
                 tx.set_data(namada::tx::Data::new(borsh::to_vec(&0).unwrap()));
                 let verifiers_from_tx = BTreeSet::default();
-                let cmt = tx.first_commitments().unwrap().clone();
+                let cmt = *tx.first_commitments().unwrap();
                 let batched_tx = tx.batch_tx(cmt);
                 (verifiers_from_tx, batched_tx)
             }
@@ -1265,7 +1265,7 @@ fn pos(c: &mut Criterion) {
                 let mut tx = Tx::from_type(namada::tx::data::TxType::Raw);
                 tx.set_data(namada::tx::Data::new(borsh::to_vec(&0).unwrap()));
                 let verifiers_from_tx = BTreeSet::default();
-                let cmt = tx.first_commitments().unwrap().clone();
+                let cmt = *tx.first_commitments().unwrap();
                 let batched_tx = tx.batch_tx(cmt);
                 (verifiers_from_tx, batched_tx)
             }

diff --git a/crates/node/src/bench_utils.rs b/crates/node/src/bench_utils.rs
@@ -89,9 +89,8 @@ use namada_apps_lib::cli;
 use namada_apps_lib::cli::context::FromContext;
 use namada_apps_lib::cli::Context;
 use namada_apps_lib::wallet::{defaults, CliWalletUtils};
-use namada_sdk::masp::{
-    self, ContextSyncStatus, ShieldedContext, ShieldedTransfer, ShieldedUtils,
-};
+use namada_sdk::masp::types::{ContextSyncStatus, ShieldedTransfer};
+use namada_sdk::masp::{self, ShieldedContext, ShieldedUtils};
 pub use namada_sdk::tx::{
     TX_BECOME_VALIDATOR_WASM, TX_BOND_WASM, TX_BRIDGE_POOL_WASM,
     TX_CHANGE_COMMISSION_WASM as TX_CHANGE_VALIDATOR_COMMISSION_WASM,
@@ -335,7 +334,7 @@ impl BenchShell {
             )));
         }
 
-        let cmt = tx.first_commitments().unwrap().clone();
+        let cmt = *tx.first_commitments().unwrap();
         tx.batch_tx(cmt)
     }
 
@@ -356,7 +355,7 @@ impl BenchShell {
 
         tx.set_data(Data::new(data));
         // NOTE: the Ibc VP doesn't actually check the signature
-        let cmt = tx.first_commitments().unwrap().clone();
+        let cmt = *tx.first_commitments().unwrap();
         tx.batch_tx(cmt)
     }
 
@@ -639,7 +638,7 @@ pub fn generate_foreign_key_tx(signer: &SecretKey) -> BatchedTx {
         None,
     )));
 
-    let cmt = tx.first_commitments().unwrap().clone();
+    let cmt = *tx.first_commitments().unwrap();
     tx.batch_tx(cmt)
 }