From a927955e04444ee4c761364296c36aafd7ec97fa Mon Sep 17 00:00:00 2001
From: Marvin Jones <jonesmc8@gmail.com>
Date: Fri, 22 May 2026 20:15:36 -0400
Subject: [PATCH] fmt fix

---
 keycard_wallet/src/lib.rs |  1 -
 wallet/src/cli/keycard.rs | 15 ++++++++----
 wallet/src/lib.rs         | 51 ++++++++++++++++++++-------------------
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/keycard_wallet/src/lib.rs b/keycard_wallet/src/lib.rs
index a2166983..a27d99fd 100644
--- a/keycard_wallet/src/lib.rs
+++ b/keycard_wallet/src/lib.rs
@@ -266,7 +266,6 @@ impl KeycardWallet {
             result
         })
     }
-
 }
 
 fn pairing_file_path() -> Option<PathBuf> {
diff --git a/wallet/src/cli/keycard.rs b/wallet/src/cli/keycard.rs
index b01e83d0..1dec07d9 100644
--- a/wallet/src/cli/keycard.rs
+++ b/wallet/src/cli/keycard.rs
@@ -40,7 +40,8 @@ impl WalletSubcommand for KeycardSubcommand {
         match self {
             Self::Available => {
                 Python::with_gil(|py| {
-                    python_path::add_python_path(py).expect("`wallet::keycard::available`: unable to setup python path");
+                    python_path::add_python_path(py)
+                        .expect("`wallet::keycard::available`: unable to setup python path");
 
                     let wallet = KeycardWallet::new(py)
                         .expect("`wallet::keycard::available`: invalid data received for pin");
@@ -61,7 +62,8 @@ impl WalletSubcommand for KeycardSubcommand {
                 let pin = read_pin()?;
 
                 Python::with_gil(|py| {
-                    python_path::add_python_path(py).expect("`wallet::keycard::connect`: unable to setup python path");
+                    python_path::add_python_path(py)
+                        .expect("`wallet::keycard::connect`: unable to setup python path");
 
                     let wallet = KeycardWallet::new(py)
                         .expect("`wallet::keycard::connect`: invalid keycard wallet provided");
@@ -80,7 +82,8 @@ impl WalletSubcommand for KeycardSubcommand {
                 let pin = read_pin()?;
 
                 Python::with_gil(|py| {
-                    python_path::add_python_path(py).expect("`wallet::keycard::disconnect`: unable to setup python path");
+                    python_path::add_python_path(py)
+                        .expect("`wallet::keycard::disconnect`: unable to setup python path");
 
                     let wallet = KeycardWallet::new(py)
                         .expect("`wallet::keycard::disconnect`: invalid keycard wallet provided");
@@ -103,7 +106,8 @@ impl WalletSubcommand for KeycardSubcommand {
                 let pin = read_pin()?;
 
                 Python::with_gil(|py| {
-                    python_path::add_python_path(py).expect("`wallet::keycard::init`: unable to setup python path");
+                    python_path::add_python_path(py)
+                        .expect("`wallet::keycard::init`: unable to setup python path");
 
                     let wallet = KeycardWallet::new(py)
                         .expect("`wallet::keycard::init`: invalid keycard wallet provided");
@@ -125,7 +129,8 @@ impl WalletSubcommand for KeycardSubcommand {
                 let mnemonic = read_mnemonic()?;
 
                 Python::with_gil(|py| {
-                    python_path::add_python_path(py).expect("`wallet::keycard::load`: unable to setup python path");
+                    python_path::add_python_path(py)
+                        .expect("`wallet::keycard::load`: unable to setup python path");
 
                     let wallet = KeycardWallet::new(py)
                         .expect("`wallet::keycard::load`: invalid keycard wallet provided");
diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
index c1e018d6..429e0df7 100644
--- a/wallet/src/lib.rs
+++ b/wallet/src/lib.rs
@@ -649,39 +649,40 @@ impl WalletCore {
 
         let mut pre_states = acc_manager.pre_states();
 
-        let (keycard_account, keycard_pin, keycard_path) =
-            if let Some(key_path_str) = mention.and_then(CliAccountMention::key_path) {
-                let pin = crate::helperfunctions::read_pin().map_err(|e| {
-                    ExecutionFailureKind::KeycardError(pyo3::PyErr::new::<
-                        pyo3::exceptions::PyRuntimeError,
-                        _,
-                    >(e.to_string()))
-                })?;
-                let account_id_str =
-                    KeycardWallet::get_public_account_id_for_path_with_connect(&pin, key_path_str)?;
-                let account_id: AccountId = match account_id_str
+        let (keycard_account, keycard_pin, keycard_path) = if let Some(key_path_str) =
+            mention.and_then(CliAccountMention::key_path)
+        {
+            let pin = crate::helperfunctions::read_pin().map_err(|e| {
+                ExecutionFailureKind::KeycardError(pyo3::PyErr::new::<
+                    pyo3::exceptions::PyRuntimeError,
+                    _,
+                >(e.to_string()))
+            })?;
+            let account_id_str =
+                KeycardWallet::get_public_account_id_for_path_with_connect(&pin, key_path_str)?;
+            let account_id: AccountId = match account_id_str
                     .parse::<AccountIdWithPrivacy>()
                     .expect("`wallet::lib::send_privacy_preserving_tx_with_pre_check`: invalid account id parsed")
                 {
                     AccountIdWithPrivacy::Public(id) | AccountIdWithPrivacy::Private(id) => id,
                 };
-                let account = self
+            let account = self
                     .get_account_public(account_id)
                     .await
                     .expect("`wallet::lib::send_privacy_preserving_tx_with_pre_check`: unable to retrieve public account");
-                let pin_str = pin.as_str().to_owned();
-                (
-                    Some(AccountWithMetadata {
-                        account,
-                        is_authorized: true,
-                        account_id,
-                    }),
-                    Some(pin_str),
-                    Some(key_path_str.to_owned()),
-                )
-            } else {
-                (None, None, None)
-            };
+            let pin_str = pin.as_str().to_owned();
+            (
+                Some(AccountWithMetadata {
+                    account,
+                    is_authorized: true,
+                    account_id,
+                }),
+                Some(pin_str),
+                Some(key_path_str.to_owned()),
+            )
+        } else {
+            (None, None, None)
+        };
 
         let mut nonces: Vec<Nonce> = acc_manager.public_account_nonces().into_iter().collect();