refactor(main): add runtime wallet module

- add wallet runtime module to serve as context
manager
- fix clippy errors

Author: tvpeter

src/client.rs

@@ -1,5 +1,3 @@
-#[cfg(feature = "rpc")]
-use bdk_bitcoind_rpc::{Emitter, bitcoincore_rpc::RpcApi};
 #[cfg(feature = "esplora")]
 use bdk_esplora::EsploraAsyncExt;
 #[cfg(any(
@@ -14,11 +12,15 @@ use {
     bdk_wallet::{
         Wallet,
         bitcoin::{Transaction, Txid},
-        chain::CanonicalizationParams,
     },
     clap::ValueEnum,
     std::path::PathBuf,
 };
+#[cfg(feature = "rpc")]
+use {
+    bdk_bitcoind_rpc::{Emitter, bitcoincore_rpc::RpcApi},
+    bdk_wallet::chain::CanonicalizationParams,
+};
 
 #[cfg(feature = "cbf")]
 use {
@@ -79,7 +81,7 @@ pub(crate) enum BlockchainClient {
 impl BlockchainClient {
     pub async fn broadcast(&self, tx: Transaction) -> Result<Txid, Error> {
         match self {
-            // #[cfg(feature = "electrum")]
+            #[cfg(feature = "electrum")]
             Self::Electrum { client, .. } => client
                 .transaction_broadcast(&tx)
                 .map_err(|e| Error::Generic(e.to_string())),

src/commands.rs

@@ -116,7 +116,7 @@ pub enum CliSubCommand {
     #[cfg(feature = "compiler")]
     #[clap(long_about = "Miniscript policy compiler")]
     Compile(CompileCommand),
-    // #[cfg(feature = "repl")]
+    #[cfg(feature = "repl")]
     /// REPL command loop mode.
     ///
     /// REPL command loop can be used to make recurring callbacks to an already loaded wallet.

src/error.rs

@@ -61,7 +61,7 @@ pub enum BDKCliError {
     #[error("PsbtError: {0}")]
     PsbtError(#[from] bdk_wallet::bitcoin::psbt::Error),
 
-    // #[cfg(feature = "sqlite")]
+    #[cfg(feature = "sqlite")]
     #[error("Rusqlite error: {0}")]
     RusqliteError(Box<bdk_wallet::rusqlite::Error>),
 

src/handlers/mod.rs

@@ -102,12 +102,6 @@ pub trait AppCommand<C> {
 ))]
 pub trait AsyncAppCommand<C> {
     type Output: FormatOutput;
-    
+
     async fn execute(&self, ctx: &mut C) -> Result<Self::Output, Error>;
 }
-
-// context for online and online
-// => cli.rs
-// handlers/{mod for commands}
-// wallet subdir /
-// wallet-offline and wallet-online (client mod)

src/handlers/offline.rs

@@ -522,7 +522,7 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CombinePsbtCommand {
     }
 }
 
-// #[cfg(feature = "bip322")]
+#[cfg(feature = "bip322")]
 #[derive(Debug, Parser, Clone, PartialEq)]
 pub struct SignMessageCommand {
     /// The message to sign
@@ -572,7 +572,7 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for SignMessageCommand {
     }
 }
 
-// #[cfg(feature = "bip322")]
+#[cfg(feature = "bip322")]
 #[derive(Debug, Parser, Clone, PartialEq)]
 pub struct VerifyMessageCommand {
     /// The signature proof to verify

src/handlers/online.rs

@@ -170,7 +170,9 @@ impl AsyncAppCommand<AppContext<OnlineOperations<'_>>> for FullScanCommand {
                 sync_kyoto_client(wallet, client).await?;
             }
         }
-        Ok(StatusResult::new("Full scan completed successfully."))
+        Ok(StatusResult {
+            message: "Full scan completed successfully.".to_string(),
+        })
     }
 }
 
@@ -190,7 +192,7 @@ impl AsyncAppCommand<AppContext<OnlineOperations<'_>>> for SyncCommand {
         &self,
         ctx: &mut AppContext<OnlineOperations<'_>>,
     ) -> Result<Self::Output, Error> {
-        let mut wallet = &mut ctx.state.wallet;
+        let wallet = &mut ctx.state.wallet;
         let client = ctx.state.client;
         #[cfg(any(feature = "electrum", feature = "esplora"))]
         let request = wallet
@@ -267,12 +269,14 @@ impl AsyncAppCommand<AppContext<OnlineOperations<'_>>> for SyncCommand {
                 let mempool_txs = emitter.mempool()?;
                 wallet.apply_unconfirmed_txs(mempool_txs.update);
             }
-            // #[cfg(feature = "cbf")]
-            KyotoClient { client } => sync_kyoto_client(&mut wallet, client)
+            #[cfg(feature = "cbf")]
+            KyotoClient { client } => sync_kyoto_client(wallet, client)
                 .await
                 .map_err(|e| Error::Generic(e.to_string()))?,
         }
-        Ok(StatusResult::new("Wallet synced successfully."))
+        Ok(StatusResult {
+            message: "Wallet synced successfully.".to_string(),
+        })
     }
 }
 
@@ -321,7 +325,7 @@ impl AsyncAppCommand<AppContext<OnlineOperations<'_>>> for BroadcastCommand {
                 psbt.extract_tx()?
             }
             (None, Some(tx)) => {
-                let tx_bytes = Vec::<u8>::from_hex(&tx)?;
+                let tx_bytes = Vec::<u8>::from_hex(tx)?;
                 Transaction::consensus_decode(&mut tx_bytes.as_slice())?
             }
             (Some(_), Some(_)) => {

src/handlers/repl.rs

@@ -1,13 +1,11 @@
-use bdk_wallet::{Wallet, bitcoin::Network};
-
-#[cfg(feature = "repl")]
-use crate::handlers::AppCommand;
-#[cfg(feature = "repl")]
-use crate::{handlers::AppContext, utils::output::FormatOutput};
-
 #[cfg(feature = "repl")]
-use crate::commands::ReplSubCommand;
-use clap::Parser;
+use {
+    crate::commands::ReplSubCommand,
+    crate::handlers::{AppCommand, AppContext},
+    crate::utils::output::FormatOutput,
+    bdk_wallet::{Wallet, bitcoin::Network},
+    clap::Parser,
+};
 
 #[cfg(any(
     feature = "electrum",
@@ -17,11 +15,7 @@ use clap::Parser;
 ))]
 use crate::client::BlockchainClient;
 #[cfg(feature = "repl")]
-use std::io::Write;
-use {
-    crate::commands::{CliOpts, WalletSubCommand},
-    crate::error::BDKCliError as Error,
-};
+use {crate::commands::WalletSubCommand, crate::error::BDKCliError as Error, std::io::Write};
 
 #[cfg(feature = "repl")]
 pub(crate) async fn respond(
@@ -36,7 +30,6 @@ pub(crate) async fn respond(
     client: Option<&BlockchainClient>,
     line: &str,
     datadir: std::path::PathBuf,
-    _cli_opts: &CliOpts,
 ) -> Result<bool, String> {
     let args = shlex::split(line).ok_or("error: Invalid quoting".to_string())?;