From 7a5233172b3a61a5c09b7d047f60fbe108a68ebe Mon Sep 17 00:00:00 2001 From: Vadim Anufriev Date: Thu, 10 Jul 2025 23:11:45 +0400 Subject: [PATCH 1/2] chore(clippy): fix clippy warnings --- src/handlers.rs | 15 +++++++-------- src/main.rs | 6 +++--- src/utils.rs | 4 ++-- tests/integration.rs | 6 +++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/handlers.rs b/src/handlers.rs index 370681a3..b711ca3a 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -355,9 +355,9 @@ pub(crate) async fn handle_online_wallet_subcommand( let mut once = HashSet::::new(); move |k, spk_i, _| { if once.insert(k) { - print!("\nScanning keychain [{:?}]", k); + print!("\nScanning keychain [{k:?}]"); } - print!(" {:<3}", spk_i); + print!(" {spk_i:<3}"); stdout.flush().expect("must flush"); } }); @@ -432,7 +432,7 @@ pub(crate) async fn handle_online_wallet_subcommand( .start_sync_with_revealed_spks() .inspect(|item, progress| { let pc = (100 * progress.consumed()) as f32 / progress.total() as f32; - eprintln!("[ SCANNING {:03.0}% ] {}", pc, item); + eprintln!("[ SCANNING {pc:03.0}% ] {item}"); }); match client { #[cfg(feature = "electrum")] @@ -558,7 +558,7 @@ pub(crate) async fn handle_online_wallet_subcommand( let subscriber = tracing_subscriber::FmtSubscriber::new(); tracing::subscriber::set_global_default(subscriber) - .map_err(|e| Error::Generic(format!("SetGlobalDefault error: {}", e)))?; + .map_err(|e| Error::Generic(format!("SetGlobalDefault error: {e}")))?; tokio::task::spawn(async move { node.run().await }); tokio::task::spawn(async move { @@ -578,7 +578,7 @@ pub(crate) async fn handle_online_wallet_subcommand( let txid = tx.compute_txid(); requester .broadcast_random(tx.clone()) - .map_err(|e| Error::Generic(format!("{}", e)))?; + .map_err(|e| Error::Generic(format!("{e}")))?; tokio::time::timeout(tokio::time::Duration::from_secs(30), async move { while let Some(info) = info_subscriber.recv().await { match info { @@ -619,8 +619,7 @@ pub(crate) fn is_final(psbt: &Psbt) -> Result<(), Error> { let psbt_inputs = psbt.inputs.len(); if unsigned_tx_inputs != psbt_inputs { return Err(Error::Generic(format!( - "Malformed PSBT, {} unsigned tx inputs and {} psbt inputs.", - unsigned_tx_inputs, psbt_inputs + "Malformed PSBT, {unsigned_tx_inputs} unsigned tx inputs and {psbt_inputs} psbt inputs." ))); } let sig_count = psbt.inputs.iter().fold(0, |count, input| { @@ -948,7 +947,7 @@ async fn respond( }; if let Some(value) = response { let value = serde_json::to_string_pretty(&value).map_err(|e| e.to_string())?; - writeln!(std::io::stdout(), "{}", value).map_err(|e| e.to_string())?; + writeln!(std::io::stdout(), "{value}").map_err(|e| e.to_string())?; std::io::stdout().flush().map_err(|e| e.to_string())?; Ok(false) } else { diff --git a/src/main.rs b/src/main.rs index f5fb5bbd..f7a074a4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,15 +28,15 @@ async fn main() { let cli_opts: CliOpts = CliOpts::parse(); let network = &cli_opts.network; - debug!("network: {:?}", network); + debug!("network: {network:?}"); if network == &Network::Bitcoin { warn!("This is experimental software and not currently recommended for use on Bitcoin mainnet, proceed with caution.") } match handle_command(cli_opts).await { - Ok(result) => println!("{}", result), + Ok(result) => println!("{result}"), Err(e) => { - error!("{}", e); + error!("{e}"); std::process::exit(1); } } diff --git a/src/utils.rs b/src/utils.rs index c72fd80e..f37a3f45 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -337,7 +337,7 @@ pub async fn sync_kyoto_client(wallet: &mut Wallet, client: Box) -> let subscriber = tracing_subscriber::FmtSubscriber::new(); tracing::subscriber::set_global_default(subscriber) - .map_err(|e| Error::Generic(format!("SetGlobalDefault error: {}", e)))?; + .map_err(|e| Error::Generic(format!("SetGlobalDefault error: {e}")))?; tokio::task::spawn(async move { node.run().await }); tokio::task::spawn(async move { @@ -354,7 +354,7 @@ pub async fn sync_kyoto_client(wallet: &mut Wallet, client: Box) -> tracing::info!("Received update: applying to wallet"); wallet .apply_update(update) - .map_err(|e| Error::Generic(format!("Failed to apply update: {}", e)))?; + .map_err(|e| Error::Generic(format!("Failed to apply update: {e}")))?; tracing::info!( "Chain tip: {}, Transactions: {}, Balance: {}", diff --git a/tests/integration.rs b/tests/integration.rs index 31ffb698..3a5f4cc6 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -127,19 +127,19 @@ mod test { node_datadir, }; - println!("BDK-CLI Config : {:#?}", bdk_cli); + println!("BDK-CLI Config : {bdk_cli:#?}"); let bdk_master_key = bdk_cli.key_exec(&["generate"])?; let bdk_xprv = get_value(&bdk_master_key, "xprv")?; let bdk_recv_desc = bdk_cli.key_exec(&["derive", "--path", "m/84h/1h/0h/0", "--xprv", &bdk_xprv])?; let bdk_recv_desc = get_value(&bdk_recv_desc, "xprv")?; - let bdk_recv_desc = format!("wpkh({})", bdk_recv_desc); + let bdk_recv_desc = format!("wpkh({bdk_recv_desc})"); let bdk_chng_desc = bdk_cli.key_exec(&["derive", "--path", "m/84h/1h/0h/1", "--xprv", &bdk_xprv])?; let bdk_chng_desc = get_value(&bdk_chng_desc, "xprv")?; - let bdk_chng_desc = format!("wpkh({})", bdk_chng_desc); + let bdk_chng_desc = format!("wpkh({bdk_chng_desc})"); bdk_cli.recv_desc = Some(bdk_recv_desc); bdk_cli.chang_desc = Some(bdk_chng_desc); From ffafb3d47a99a6ab80be769b396f6776f20bf01b Mon Sep 17 00:00:00 2001 From: Vadim Anufriev Date: Sun, 13 Jul 2025 22:39:03 +0400 Subject: [PATCH 2/2] refactor: delete unnecessary variable --- src/handlers.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/handlers.rs b/src/handlers.rs index b711ca3a..0171a515 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -746,7 +746,6 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result { wallet_opts, subcommand: WalletSubCommand::OnlineWalletSubCommand(online_subcommand), } => { - let network = cli_opts.network; let home_dir = prepare_home_dir(cli_opts.datadir)?; let wallet_name = &wallet_opts.wallet; let database_path = prepare_wallet_db_dir(wallet_name, &home_dir)?;