cli/client: refactor saving of wallet of custom and transfer tx

anoma · Aug 3, 2023 · 65a07be · 65a07be
1 parent 7614463
commit 65a07be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/apps/src/lib/cli/client.rs b/apps/src/lib/cli/client.rs
@@ -38,19 +38,7 @@ impl<IO> CliApi<IO> {
                             .await
                             .proceed_or_else(error)?;
                         let args = args.to_sdk(&mut ctx);
-                        let dry_run = args.tx.dry_run;
                         tx::submit_custom(&client, &mut ctx, args).await?;
-                        if !dry_run {
-                            crate::wallet::save(
-                                &ctx.borrow_chain_or_exit().wallet,
-                            )
-                            .unwrap_or_else(|err| eprintln!("{}", err));
-                        } else {
-                            println!(
-                                "Transaction dry run. No addresses have been \
-                                 saved."
-                            )
-                        }
                     }
                     Sub::TxTransfer(TxTransfer(mut args)) => {
                         let client = client.unwrap_or_else(|| {
@@ -102,19 +90,8 @@ impl<IO> CliApi<IO> {
                             .await
                             .proceed_or_else(error)?;
                         let args = args.to_sdk(&mut ctx);
-                        let dry_run = args.tx.dry_run;
                         tx::submit_init_account(&client, &mut ctx, args)
                             .await?;
-                        if !dry_run {
-                            let chain_ctx = ctx.borrow_chain_or_exit();
-                            crate::wallet::save(&chain_ctx.wallet)
-                                .unwrap_or_else(|err| eprintln!("{}", err));
-                        } else {
-                            println!(
-                                "Transaction dry run. No addresses have been \
-                                 saved."
-                            )
-                        }
                     }
                     Sub::TxInitValidator(TxInitValidator(mut args)) => {
                         let client = client.unwrap_or_else(|| {

diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
@@ -87,6 +87,12 @@ where
         .await?;
     signing::sign_tx(&mut chain_ctx.wallet, &mut tx, &args.tx, &pk).await?;
     tx::process_tx(client, &mut chain_ctx.wallet, &args.tx, tx).await?;
+    if !args.tx.dry_run {
+        crate::wallet::save(&chain_ctx.wallet)
+            .unwrap_or_else(|err| eprintln!("{}", err));
+    } else {
+        println!("Transaction dry run. No addresses have been saved.")
+    }
     Ok(())
 }
 
@@ -127,6 +133,12 @@ where
         .await?;
     signing::sign_tx(&mut chain_ctx.wallet, &mut tx, &args.tx, &pk).await?;
     tx::process_tx(client, &mut chain_ctx.wallet, &args.tx, tx).await?;
+    if !args.tx.dry_run {
+        crate::wallet::save(&chain_ctx.wallet)
+            .unwrap_or_else(|err| eprintln!("{}", err));
+    } else {
+        println!("Transaction dry run. No addresses have been saved.")
+    }
     Ok(())
 }