diff --git a/src/backend_task/contested_names/vote_on_dpns_name.rs b/src/backend_task/contested_names/vote_on_dpns_name.rs index 7806cbcbf..99c654e02 100644 --- a/src/backend_task/contested_names/vote_on_dpns_name.rs +++ b/src/backend_task/contested_names/vote_on_dpns_name.rs @@ -78,10 +78,7 @@ impl AppContext { vote_results.push((name.to_owned(), vote_choice, result)); } else { return Err(TaskError::NoVotingIdentity { - identity_id: qualified_identity - .identity - .id() - .to_string(Encoding::Base58), + identity_id: qualified_identity.identity.id().to_string(Encoding::Base58), }); } } diff --git a/src/backend_task/dashpay.rs b/src/backend_task/dashpay.rs index f1ead0a6d..6a88ea55d 100644 --- a/src/backend_task/dashpay.rs +++ b/src/backend_task/dashpay.rs @@ -173,7 +173,11 @@ impl AppContext { let identity_id = identity.identity.id(); let records = payments::load_payment_history(self, &identity_id, None) .await - .map_err(|e| crate::backend_task::dashpay::errors::DashPayError::Internal { message: e })?; + .map_err( + |e| crate::backend_task::dashpay::errors::DashPayError::Internal { + message: e, + }, + )?; let network_str = self.network.to_string(); let contacts = self @@ -254,7 +258,11 @@ impl AppContext { let result = incoming_payments::register_dashpay_addresses_for_identity(self, &identity) .await - .map_err(|e| crate::backend_task::dashpay::errors::DashPayError::Internal { message: e })?; + .map_err(|e| { + crate::backend_task::dashpay::errors::DashPayError::Internal { + message: e, + } + })?; Ok(BackendTaskSuccessResult::Message(format!( "Registered {} DashPay addresses for {} contacts{}", diff --git a/src/backend_task/dashpay/contact_requests.rs b/src/backend_task/dashpay/contact_requests.rs index 9fb97fd75..6ae6d1f10 100644 --- a/src/backend_task/dashpay/contact_requests.rs +++ b/src/backend_task/dashpay/contact_requests.rs @@ -281,12 +281,16 @@ pub async fn send_contact_request_with_proof( &wallets, identity.network, ) - .map_err(|e| TaskError::EncryptionError { detail: format!("Error resolving ENCRYPTION private key: {}", e) })? + .map_err(|e| TaskError::EncryptionError { + detail: format!("Error resolving ENCRYPTION private key: {}", e), + })? .map(|(_, private_key)| private_key) - .ok_or_else(|| TaskError::DashPay(DashPayError::PrivateKeyResolution { - key_purpose: "ENCRYPTION".to_string(), - reason: "Private key not loaded into Dash Evo Tool".to_string(), - }))?; + .ok_or_else(|| { + TaskError::DashPay(DashPayError::PrivateKeyResolution { + key_purpose: "ENCRYPTION".to_string(), + reason: "Private key not loaded into Dash Evo Tool".to_string(), + }) + })?; let shared_key = generate_ecdh_shared_key(&sender_private_key, recipient_key) .map_err(|e| TaskError::EncryptionError { detail: e })?; @@ -367,7 +371,9 @@ pub async fn send_contact_request_with_proof( current_height_for_validation, ) .await - .map_err(|e| DashPayError::ValidationFailed { errors: vec![e.to_string()] })?; + .map_err(|e| DashPayError::ValidationFailed { + errors: vec![e.to_string()], + })?; // Check if validation passed if !validation.is_valid { @@ -513,10 +519,11 @@ pub async fn send_contact_request_with_proof( async fn resolve_username_to_identity(sdk: &Sdk, username: &str) -> Result { // Parse username (e.g., "alice.dash" -> "alice") - let name = username - .split('.') - .next() - .ok_or_else(|| TaskError::DashPay(DashPayError::InvalidUsername { username: username.to_string() }))?; + let name = username.split('.').next().ok_or_else(|| { + TaskError::DashPay(DashPayError::InvalidUsername { + username: username.to_string(), + }) + })?; // Query DPNS for the username let dpns_contract_id = Identifier::from_string( @@ -547,13 +554,17 @@ async fn resolve_username_to_identity(sdk: &Sdk, username: &str) -> Result { // Reload UTXOs (RPC: fetches from Core; SPV: no-op). // Only retry if something actually changed. - if !wallet.reload_utxos(self).map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? { - return Err(TaskError::AssetLockTransactionBuildFailed { detail: e }); + if !wallet + .reload_utxos(self) + .map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? + { + return Err(TaskError::AssetLockTransactionBuildFailed { + detail: e, + }); } wallet .registration_asset_lock_transaction( @@ -115,7 +120,9 @@ impl AppContext { true, identity_index, ) - .map_err(|e| TaskError::AssetLockTransactionBuildFailed { detail: e })? + .map_err(|e| TaskError::AssetLockTransactionBuildFailed { + detail: e, + })? } } }; @@ -222,7 +229,9 @@ impl AppContext { .create_identifier() .map_err(|e| TaskError::from(dash_sdk::Error::Protocol(e)))?; - let public_keys = keys.to_public_keys_map().map_err(|e| TaskError::PublicKeyMapBuildFailed { detail: e })?; + let public_keys = keys + .to_public_keys_map() + .map_err(|e| TaskError::PublicKeyMapBuildFailed { detail: e })?; // Debug: Log the keys being registered to verify contract bounds are set for (key_id, key) in &public_keys { @@ -523,7 +532,9 @@ impl AppContext { let sdk = self.sdk.load().as_ref().clone(); - let public_keys = keys.to_public_keys_map().map_err(|e| TaskError::PublicKeyMapBuildFailed { detail: e })?; + let public_keys = keys + .to_public_keys_map() + .map_err(|e| TaskError::PublicKeyMapBuildFailed { detail: e })?; // Calculate fee estimate for identity creation from platform addresses let key_count = public_keys.len(); diff --git a/src/backend_task/identity/top_up_identity.rs b/src/backend_task/identity/top_up_identity.rs index 75ca8ce59..7d66f8e23 100644 --- a/src/backend_task/identity/top_up_identity.rs +++ b/src/backend_task/identity/top_up_identity.rs @@ -113,8 +113,13 @@ impl AppContext { Err(e) => { // Reload UTXOs (RPC: fetches from Core; SPV: no-op). // Only retry if something actually changed. - if !wallet.reload_utxos(self).map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? { - return Err(TaskError::AssetLockTransactionBuildFailed { detail: e }); + if !wallet + .reload_utxos(self) + .map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? + { + return Err(TaskError::AssetLockTransactionBuildFailed { + detail: e, + }); } wallet .top_up_asset_lock_transaction( @@ -125,7 +130,9 @@ impl AppContext { identity_index, top_up_index, ) - .map_err(|e| TaskError::AssetLockTransactionBuildFailed { detail: e })? + .map_err(|e| TaskError::AssetLockTransactionBuildFailed { + detail: e, + })? } }; ( @@ -177,7 +184,9 @@ impl AppContext { identity_index, top_up_index, ) - .map_err(|e| TaskError::AssetLockTransactionBuildFailed { detail: e })?; + .map_err(|e| TaskError::AssetLockTransactionBuildFailed { + detail: e, + })?; (tx_result.0, tx_result.1, seed_hash) }; diff --git a/src/backend_task/tokens/query_my_token_balances.rs b/src/backend_task/tokens/query_my_token_balances.rs index 8a4774f8d..3473d6224 100644 --- a/src/backend_task/tokens/query_my_token_balances.rs +++ b/src/backend_task/tokens/query_my_token_balances.rs @@ -1,7 +1,7 @@ //! Query token balances from Platform -use crate::backend_task::error::TaskError; use crate::backend_task::BackendTaskSuccessResult; +use crate::backend_task::error::TaskError; use crate::context::AppContext; use dash_sdk::dpp::identity::accessors::IdentityGettersV0; use dash_sdk::platform::tokens::identity_token_balances::{ diff --git a/src/backend_task/wallet/fund_platform_address_from_asset_lock.rs b/src/backend_task/wallet/fund_platform_address_from_asset_lock.rs index 669c49c6a..a06d7b74a 100644 --- a/src/backend_task/wallet/fund_platform_address_from_asset_lock.rs +++ b/src/backend_task/wallet/fund_platform_address_from_asset_lock.rs @@ -38,7 +38,9 @@ impl AppContext { // Get the private key for the asset lock address let private_key = wallet .private_key_for_address(&asset_lock_address, self.network) - .map_err(|e| crate::backend_task::error::TaskError::WalletKeyLookupFailed { detail: e })? + .map_err( + |e| crate::backend_task::error::TaskError::WalletKeyLookupFailed { detail: e }, + )? .ok_or(crate::backend_task::error::TaskError::AssetLockAddressNotFound)?; (wallet, sdk, private_key) diff --git a/src/backend_task/wallet/fund_platform_address_from_wallet_utxos.rs b/src/backend_task/wallet/fund_platform_address_from_wallet_utxos.rs index 024b35feb..a84d969c9 100644 --- a/src/backend_task/wallet/fund_platform_address_from_wallet_utxos.rs +++ b/src/backend_task/wallet/fund_platform_address_from_wallet_utxos.rs @@ -61,7 +61,10 @@ impl AppContext { Err(e) => { // Reload UTXOs (RPC: fetches from Core; SPV: no-op). // Only retry if something actually changed. - if !wallet.reload_utxos(self).map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? { + if !wallet + .reload_utxos(self) + .map_err(|e| TaskError::UtxoUpdateFailed { detail: e })? + { return Err(TaskError::AssetLockTransactionBuildFailed { detail: e }); } let (tx, private_key, address, _change, utxos) = wallet diff --git a/src/backend_task/wallet/generate_receive_address.rs b/src/backend_task/wallet/generate_receive_address.rs index d03ca6f37..977cbb8ac 100644 --- a/src/backend_task/wallet/generate_receive_address.rs +++ b/src/backend_task/wallet/generate_receive_address.rs @@ -22,7 +22,11 @@ impl AppContext { .spv_manager .next_bip44_receive_address(seed_hash, 0) .await - .map_err(|e| crate::backend_task::error::TaskError::WalletAddressDerivationFailed { detail: e })?; + .map_err(|e| { + crate::backend_task::error::TaskError::WalletAddressDerivationFailed { + detail: e, + } + })?; let _ = self.register_spv_address( &wallet_arc, @@ -37,7 +41,11 @@ impl AppContext { let mut wallet = wallet_arc.write()?; wallet .receive_address(self.network, true, Some(self)) - .map_err(|e| crate::backend_task::error::TaskError::WalletAddressDerivationFailed { detail: e })? + .map_err(|e| { + crate::backend_task::error::TaskError::WalletAddressDerivationFailed { + detail: e, + } + })? .to_string() }; diff --git a/src/context/mod.rs b/src/context/mod.rs index 650ffea5b..0162bced5 100644 --- a/src/context/mod.rs +++ b/src/context/mod.rs @@ -484,14 +484,17 @@ impl AppContext { &addr, Auth::UserPass(cfg.core_rpc_user.clone(), cfg.core_rpc_password.clone()), ) - .map_err(|e| TaskError::RpcProviderCreationFailed { detail: e.to_string() })?; + .map_err(|e| TaskError::RpcProviderCreationFailed { + detail: e.to_string(), + })?; // 3. Rebuild the Sdk with the updated config and current backend mode let new_sdk = match self.core_backend_mode() { CoreBackendMode::Spv => { // Reuse existing SPV provider (rebinding below to ensure context is set) let provider = self.spv_context_provider.read()?.clone(); - initialize_sdk(&cfg, self.network, provider).map_err(|e| TaskError::SdkInitializationFailed { detail: e })? + initialize_sdk(&cfg, self.network, provider) + .map_err(|e| TaskError::SdkInitializationFailed { detail: e })? } CoreBackendMode::Rpc => { // Create a fresh RPC provider with the new config @@ -502,7 +505,8 @@ impl AppContext { let mut guard = self.rpc_context_provider.write()?; *guard = rpc_provider.clone(); } - initialize_sdk(&cfg, self.network, rpc_provider).map_err(|e| TaskError::SdkInitializationFailed { detail: e })? + initialize_sdk(&cfg, self.network, rpc_provider) + .map_err(|e| TaskError::SdkInitializationFailed { detail: e })? } }; @@ -564,7 +568,9 @@ impl AppContext { let url = match wallet_name { Some(name) if !name.is_empty() => { if name.contains("..") { - return Err(TaskError::InvalidCoreWalletName { name: name.to_string() }); + return Err(TaskError::InvalidCoreWalletName { + name: name.to_string(), + }); } let encoded = urlencoding::encode(name); format!("{}/wallet/{}", base, encoded) diff --git a/src/context/transaction_processing.rs b/src/context/transaction_processing.rs index f61976f20..0c315e4ae 100644 --- a/src/context/transaction_processing.rs +++ b/src/context/transaction_processing.rs @@ -326,10 +326,8 @@ impl AppContext { .first() .ok_or(TaskError::AssetLockNoCreditOutputs)?; - let address = - Address::from_script(&first.script_pubkey, self.network).map_err(|e| { - TaskError::AssetLockAddressDerivationFailed { source: e } - })?; + let address = Address::from_script(&first.script_pubkey, self.network) + .map_err(|e| TaskError::AssetLockAddressDerivationFailed { source: e })?; // Add the asset lock to the wallet's unused_asset_locks wallet