Merge branch 'origin/murisi/remove-sdk-lifetimes' (#2225)

anoma · Nov 28, 2023 · e41fe22 · e41fe22
2 parents 5e90dc0 + 8afe908
commit e41fe22
Show file tree

Hide file tree

Showing 20 changed files with 486 additions and 497 deletions.
diff --git a/.changelog/unreleased/SDK/2225-remove-sdk-lifetimes.md b/.changelog/unreleased/SDK/2225-remove-sdk-lifetimes.md
@@ -0,0 +1,2 @@
+- Removed uses of lifetimes in the SDKs Namada trait and implementation
+  ([\#2225](https://github.com/anoma/namada/pull/2225))
diff --git a/apps/src/bin/namada-client/main.rs b/apps/src/bin/namada-client/main.rs
@@ -16,7 +16,7 @@ async fn main() -> Result<()> {
     CliApi::handle_client_command::<HttpClient, _>(
         None,
         cli::namada_client_cli()?,
-        &CliIo,
+        CliIo,
     )
     .await
 }
diff --git a/apps/src/bin/namada-relayer/main.rs b/apps/src/bin/namada-relayer/main.rs
@@ -14,5 +14,5 @@ async fn main() -> Result<()> {
 
     let cmd = cli::namada_relayer_cli()?;
     // run the CLI
-    CliApi::handle_relayer_command::<HttpClient>(None, cmd, &CliIo).await
+    CliApi::handle_relayer_command::<HttpClient>(None, cmd, CliIo).await
 }
diff --git a/apps/src/lib/bench_utils.rs b/apps/src/lib/bench_utils.rs
@@ -93,7 +93,7 @@ pub use namada_sdk::tx::{
     TX_WITHDRAW_WASM, VP_USER_WASM,
 };
 use namada_sdk::wallet::Wallet;
-use namada_sdk::NamadaImpl;
+use namada_sdk::{Namada, NamadaImpl};
 use namada_test_utils::tx_data::TxWriteData;
 use rand_core::OsRng;
 use sha2::{Digest, Sha256};
@@ -815,11 +815,11 @@ impl Default for BenchShieldedCtx {
 
 impl BenchShieldedCtx {
     pub fn generate_masp_tx(
-        &mut self,
+        mut self,
         amount: Amount,
         source: TransferSource,
         target: TransferTarget,
-    ) -> Tx {
+    ) -> (Self, Tx) {
         let denominated_amount = DenominatedAmount {
             amount,
             denom: 0.into(),
@@ -836,12 +836,13 @@ impl BenchShieldedCtx {
                 &[],
             ))
             .unwrap();
+        let native_token = self.shell.wl_storage.storage.native_token.clone();
         let namada = NamadaImpl::native_new(
-            &self.shell,
-            &mut self.wallet,
-            &mut self.shielded,
-            &StdIo,
-            self.shell.wl_storage.storage.native_token.clone(),
+            self.shell,
+            self.wallet,
+            self.shielded,
+            StdIo,
+            native_token,
         );
         let shielded = async_runtime
             .block_on(
@@ -873,7 +874,7 @@ impl BenchShieldedCtx {
             )
         });
 
-        self.shell.generate_tx(
+        let tx = namada.client().generate_tx(
             TX_TRANSFER_WASM,
             Transfer {
                 source: source.effective_address(),
@@ -886,6 +887,18 @@ impl BenchShieldedCtx {
             shielded,
             None,
             vec![&defaults::albert_keypair()],
-        )
+        );
+        let NamadaImpl {
+            client,
+            wallet,
+            shielded,
+            ..
+        } = namada;
+        let ctx = Self {
+            shielded: shielded.into_inner(),
+            shell: client,
+            wallet: wallet.into_inner(),
+        };
+        (ctx, tx)
     }
 }