format: rustfmt for incorrect sdk-wallet-force commits

apps/src/bin/namada-wallet/cli.rs

@@ -276,7 +276,12 @@ fn address_key_add(
             let password = read_and_confirm_pwd(unsafe_dont_encrypt);
             let alias = ctx
                 .wallet
-                .encrypt_insert_spending_key(alias, spending_key, password, alias_force)
+                .encrypt_insert_spending_key(
+                    alias,
+                    spending_key,
+                    password,
+                    alias_force,
+                )
                 .unwrap_or_else(|| {
                     eprintln!("Spending key not added");
                     cli::safe_exit(1);
@@ -492,7 +497,11 @@ fn address_or_alias_find(ctx: Context, args: args::AddressOrAliasFind) {
 fn address_add(ctx: Context, args: args::AddressAdd) {
     let mut wallet = ctx.wallet;
     if wallet
-        .add_address(args.alias.clone().to_lowercase(), args.address, args.alias_force)
+        .add_address(
+            args.alias.clone().to_lowercase(),
+            args.address,
+            args.alias_force,
+        )
         .is_none()
     {
         eprintln!("Address not added");

apps/src/lib/cli.rs

@@ -3573,7 +3573,11 @@ pub mod args {
             let alias = ALIAS.parse(matches);
             let alias_force = ALIAS_FORCE.parse(matches);
             let address = RAW_ADDRESS.parse(matches);
-            Self { alias, alias_force, address }
+            Self {
+                alias,
+                alias_force,
+                address,
+            }
         }
 
         fn def(app: App) -> App {

apps/src/lib/client/tx.rs

@@ -113,7 +113,12 @@ pub async fn submit_init_validator<
         println!("Generating validator account key...");
         let password = read_and_confirm_pwd(unsafe_dont_encrypt);
         ctx.wallet
-            .gen_key(scheme, Some(validator_key_alias.clone()), password, tx_args.wallet_alias_force)
+            .gen_key(
+                scheme,
+                Some(validator_key_alias.clone()),
+                password,
+                tx_args.wallet_alias_force,
+            )
             .1
             .ref_to()
     });

apps/src/lib/client/utils.rs

@@ -502,8 +502,12 @@ pub fn init_network(
             let alias = format!("{}-consensus-key", name);
             println!("Generating validator {} consensus key...", name);
             let password = read_and_confirm_pwd(unsafe_dont_encrypt);
-            let (_alias, keypair) =
-                wallet.gen_key(SchemeType::Ed25519, Some(alias), password, true);
+            let (_alias, keypair) = wallet.gen_key(
+                SchemeType::Ed25519,
+                Some(alias),
+                password,
+                true,
+            );
 
             // Write consensus key for Tendermint
             tendermint_node::write_validator_key(&tm_home_dir, &keypair);
@@ -519,8 +523,12 @@ pub fn init_network(
             let alias = format!("{}-account-key", name);
             println!("Generating validator {} account key...", name);
             let password = read_and_confirm_pwd(unsafe_dont_encrypt);
-            let (_alias, keypair) =
-                wallet.gen_key(SchemeType::Ed25519, Some(alias), password, true);
+            let (_alias, keypair) = wallet.gen_key(
+                SchemeType::Ed25519,
+                Some(alias),
+                password,
+                true,
+            );
             keypair.ref_to()
         });
 
@@ -532,8 +540,12 @@ pub fn init_network(
             let alias = format!("{}-protocol-key", name);
             println!("Generating validator {} protocol signing key...", name);
             let password = read_and_confirm_pwd(unsafe_dont_encrypt);
-            let (_alias, keypair) =
-                wallet.gen_key(SchemeType::Ed25519, Some(alias), password, true);
+            let (_alias, keypair) = wallet.gen_key(
+                SchemeType::Ed25519,
+                Some(alias),
+                password,
+                true,
+            );
             keypair.ref_to()
         });
 

shared/src/ledger/args.rs

@@ -383,7 +383,8 @@ pub struct Tx<C: NamadaTypes = SdkTypes> {
     /// If any new account is initialized by the tx, use the given alias to
     /// save it in the wallet.
     pub initialized_account_alias: Option<String>,
-    /// Whether to force overwrite the above alias, if it is provided, in the wallet.
+    /// Whether to force overwrite the above alias, if it is provided, in the
+    /// wallet.
     pub wallet_alias_force: bool,
     /// The amount being payed to include the transaction
     pub fee_amount: token::Amount,

shared/src/ledger/tx.rs

@@ -488,7 +488,11 @@ pub async fn save_initialized_accounts<U: WalletUtils>(
                 None => U::read_alias(&encoded).into(),
             };
             let alias = alias.into_owned();
-            let added = wallet.add_address(alias.clone(), address.clone(), args.wallet_alias_force);
+            let added = wallet.add_address(
+                alias.clone(),
+                address.clone(),
+                args.wallet_alias_force,
+            );
             match added {
                 Some(new_alias) if new_alias != encoded => {
                     println!(

shared/src/ledger/wallet/mod.rs

@@ -112,7 +112,9 @@ impl<U: WalletUtils> Wallet<U> {
         password: Option<String>,
         force_alias: bool,
     ) -> (String, common::SecretKey) {
-        let (alias, key) = self.store.gen_key::<U>(scheme, alias, password, force_alias);
+        let (alias, key) =
+            self.store
+                .gen_key::<U>(scheme, alias, password, force_alias);
         // Cache the newly added key
         self.decrypted_key_cache.insert(alias.clone(), key.clone());
         (alias.into(), key)
@@ -125,7 +127,9 @@ impl<U: WalletUtils> Wallet<U> {
         password: Option<String>,
         force_alias: bool,
     ) -> (String, ExtendedSpendingKey) {
-        let (alias, key) = self.store.gen_spending_key::<U>(alias, password, force_alias);
+        let (alias, key) =
+            self.store
+                .gen_spending_key::<U>(alias, password, force_alias);
         // Cache the newly added key
         self.decrypted_spendkey_cache.insert(alias.clone(), key);
         (alias.into(), key)
@@ -436,7 +440,12 @@ impl<U: WalletUtils> Wallet<U> {
         force_alias: bool,
     ) -> Option<String> {
         self.store
-            .insert_spending_key::<U>(alias.into(), spend_key, viewkey, force_alias)
+            .insert_spending_key::<U>(
+                alias.into(),
+                spend_key,
+                viewkey,
+                force_alias,
+            )
             .map(Into::into)
     }
 

shared/src/ledger/wallet/store.rs

@@ -239,12 +239,20 @@ impl Store {
         let address = Address::Implicit(ImplicitAddress(pkh.clone()));
         let alias: Alias = alias.unwrap_or_else(|| pkh.clone().into()).into();
         if self
-            .insert_keypair::<U>(alias.clone(), keypair_to_store, pkh, force_alias)
+            .insert_keypair::<U>(
+                alias.clone(),
+                keypair_to_store,
+                pkh,
+                force_alias,
+            )
             .is_none()
         {
             panic!("Action cancelled, no changes persisted.");
         }
-        if self.insert_address::<U>(alias.clone(), address, force_alias).is_none() {
+        if self
+            .insert_address::<U>(alias.clone(), address, force_alias)
+            .is_none()
+        {
             panic!("Action cancelled, no changes persisted.");
         }
         (alias, raw_keypair)
@@ -263,7 +271,12 @@ impl Store {
             StoredKeypair::new(spendkey, password);
         let alias = Alias::from(alias);
         if self
-            .insert_spending_key::<U>(alias.clone(), spendkey_to_store, viewkey, force_alias)
+            .insert_spending_key::<U>(
+                alias.clone(),
+                spendkey_to_store,
+                viewkey,
+                force_alias,
+            )
             .is_none()
         {
             panic!("Action cancelled, no changes persisted.");
@@ -319,7 +332,8 @@ impl Store {
                     // terminates with a cancellation
                     counterpart_address
                         .map(|x| self.addresses.insert(alias.clone(), x.1));
-                    return self.insert_keypair::<U>(new_alias, keypair, pkh, false);
+                    return self
+                        .insert_keypair::<U>(new_alias, keypair, pkh, false);
                 }
                 ConfirmationResponse::Skip => {
                     // Restore the removed address since this insertion action
@@ -384,7 +398,8 @@ impl Store {
             match U::show_overwrite_confirmation(&alias, "a viewing key") {
                 ConfirmationResponse::Replace => {}
                 ConfirmationResponse::Reselect(new_alias) => {
-                    return self.insert_viewing_key::<U>(new_alias, viewkey, false);
+                    return self
+                        .insert_viewing_key::<U>(new_alias, viewkey, false);
                 }
                 ConfirmationResponse::Skip => return None,
             }
@@ -428,8 +443,11 @@ impl Store {
             match U::show_overwrite_confirmation(&alias, "a payment address") {
                 ConfirmationResponse::Replace => {}
                 ConfirmationResponse::Reselect(new_alias) => {
-                    return self
-                        .insert_payment_addr::<U>(new_alias, payment_addr, false);
+                    return self.insert_payment_addr::<U>(
+                        new_alias,
+                        payment_addr,
+                        false,
+                    );
                 }
                 ConfirmationResponse::Skip => return None,
             }