From dfab1d6fa873613a1ff94fa21055380cba4dc3a2 Mon Sep 17 00:00:00 2001
From: Sergio Chouhy <sergio.chouhy@gmail.com>
Date: Tue, 30 Sep 2025 14:31:04 -0300
Subject: [PATCH] minor refactor

---
 wallet/src/token_transfers/deshielded.rs |  9 ++++-----
 wallet/src/token_transfers/private.rs    | 16 ++++++++--------
 wallet/src/token_transfers/shielded.rs   | 12 ++++--------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/wallet/src/token_transfers/deshielded.rs b/wallet/src/token_transfers/deshielded.rs
index adf0614..65a4b18 100644
--- a/wallet/src/token_transfers/deshielded.rs
+++ b/wallet/src/token_transfers/deshielded.rs
@@ -12,14 +12,13 @@ impl WalletCore {
         to: Address,
         balance_to_move: u128,
     ) -> Result<(SendTxResponse, nssa_core::SharedSecretKey), ExecutionFailureKind> {
-        let from_data = self.storage.user_data.get_private_account(&from).cloned();
-        let to_data = self.get_account(to).await;
-
-        let Some((from_keys, mut from_acc)) = from_data else {
+        let Some((from_keys, mut from_acc)) =
+            self.storage.user_data.get_private_account(&from).cloned()
+        else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
-        let Ok(to_acc) = to_data else {
+        let Ok(to_acc) = self.get_account(to).await else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
diff --git a/wallet/src/token_transfers/private.rs b/wallet/src/token_transfers/private.rs
index 11ae6dc..b707570 100644
--- a/wallet/src/token_transfers/private.rs
+++ b/wallet/src/token_transfers/private.rs
@@ -12,9 +12,9 @@ impl WalletCore {
         to_ipk: nssa_core::encryption::IncomingViewingPublicKey,
         balance_to_move: u128,
     ) -> Result<(SendTxResponse, nssa_core::SharedSecretKey), ExecutionFailureKind> {
-        let from_data = self.storage.user_data.get_private_account(&from).cloned();
-
-        let Some((from_keys, mut from_acc)) = from_data else {
+        let Some((from_keys, mut from_acc)) =
+            self.storage.user_data.get_private_account(&from).cloned()
+        else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
@@ -116,14 +116,14 @@ impl WalletCore {
         to: Address,
         balance_to_move: u128,
     ) -> Result<(SendTxResponse, nssa_core::SharedSecretKey), ExecutionFailureKind> {
-        let from_data = self.storage.user_data.get_private_account(&from).cloned();
-        let to_data = self.storage.user_data.get_private_account(&to).cloned();
-
-        let Some((from_keys, mut from_acc)) = from_data else {
+        let Some((from_keys, mut from_acc)) =
+            self.storage.user_data.get_private_account(&from).cloned()
+        else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
-        let Some((to_keys, mut to_acc)) = to_data else {
+        let Some((to_keys, mut to_acc)) = self.storage.user_data.get_private_account(&to).cloned()
+        else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
diff --git a/wallet/src/token_transfers/shielded.rs b/wallet/src/token_transfers/shielded.rs
index 3d6fd06..2db3ff8 100644
--- a/wallet/src/token_transfers/shielded.rs
+++ b/wallet/src/token_transfers/shielded.rs
@@ -11,14 +11,12 @@ impl WalletCore {
         to: Address,
         balance_to_move: u128,
     ) -> Result<(SendTxResponse, nssa_core::SharedSecretKey), ExecutionFailureKind> {
-        let from_data = self.get_account(from).await;
-        let to_data = self.storage.user_data.get_private_account(&to).cloned();
-
-        let Ok(from_acc) = from_data else {
+        let Ok(from_acc) = self.get_account(from).await else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
-        let Some((to_keys, mut to_acc)) = to_data else {
+        let Some((to_keys, mut to_acc)) = self.storage.user_data.get_private_account(&to).cloned()
+        else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };
 
@@ -107,9 +105,7 @@ impl WalletCore {
         to_ipk: nssa_core::encryption::IncomingViewingPublicKey,
         balance_to_move: u128,
     ) -> Result<(SendTxResponse, nssa_core::SharedSecretKey), ExecutionFailureKind> {
-        let from_data = self.get_account(from).await;
-
-        let Ok(from_acc) = from_data else {
+        let Ok(from_acc) = self.get_account(from).await else {
             return Err(ExecutionFailureKind::KeyNotFoundError);
         };