refactor: fix error handling

-add more error types to error.rs
- update the handlers file to replace Generic type

[Ticket: X]

Author: tvpeter

src/commands.rs

@@ -195,8 +195,8 @@ pub struct WalletOpts {
 
     #[cfg(feature = "rpc")]
     /// Sets an optional cookie authentication.
-    #[arg(name = "COOKIE", long)]
-    pub cookie: Option<String>
+    #[clap(name = "COOKIE", long = "cookie")]
+    pub cookie: Option<String>,
 }
 
 /// Options to configure a SOCKS5 proxy for a blockchain client connection.

src/error.rs

@@ -4,7 +4,6 @@ use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum BDKCliError {
-    
     #[error("BIP39 error: {0}")]
     BIP39Error(#[from] bdk_wallet::bip39::Error),
 
@@ -39,6 +38,9 @@ pub enum BDKCliError {
     #[error("Key error: {0}")]
     KeyError(#[from] bdk_wallet::keys::KeyError),
 
+    #[error("LocalChain error: {0}")]
+    LocalChainError(#[from] bdk_wallet::chain::local_chain::ApplyHeaderError),
+
     #[error("Miniscript error: {0}")]
     MiniscriptError(#[from] bdk_wallet::miniscript::Error),
 
@@ -79,4 +81,8 @@ pub enum BDKCliError {
 
     #[error("Consensus decoding error: {0}")]
     Hex(#[from] HexToBytesError),
+
+    #[cfg(feature = "rpc")]
+    #[error("RPC error: {0}")]
+    BitcoinCoreRpcError(#[from] bdk_bitcoind_rpc::bitcoincore_rpc::Error),
 }

src/handlers.rs

@@ -58,7 +58,7 @@ use {crate::utils::BlockchainClient::Esplora, bdk_esplora::EsploraAsyncExt};
 #[cfg(feature = "rpc")]
 use {
     crate::utils::BlockchainClient::RpcClient,
-    bdk_bitcoind_rpc::{Emitter, bitcoincore_rpc::RpcApi},
+    bdk_bitcoind_rpc::{bitcoincore_rpc::RpcApi, Emitter},
     bdk_wallet::chain::{BlockId, CheckPoint},
 };
 
@@ -361,9 +361,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     client
                         .populate_tx_cache(wallet.tx_graph().full_txs().map(|tx_node| tx_node.tx));
 
-                    let update = client
-                        .full_scan(request, stop_gap, batch_size, false)
-                        .map_err(|e| Error::Generic(e.to_string()))?;
+                    let update = client.full_scan(request, stop_gap, batch_size, false)?;
                     wallet.apply_update(update)?;
                 }
                 #[cfg(feature = "esplora")]
@@ -374,7 +372,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     let update = client
                         .full_scan(request, stop_gap, parallel_requests)
                         .await
-                        .map_err(|e| Error::Generic(e.to_string()))?;
+                        .map_err(|e| *e)?;
                     wallet.apply_update(update)?;
                 }
 
@@ -389,20 +387,15 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     let mut emitter =
                         Emitter::new(&client, genesis_cp.clone(), genesis_cp.height());
 
-                    while let Some(block_event) = emitter
-                        .next_block()
-                        .map_err(|e| Error::Generic(e.to_string()))?
-                    {
-                        wallet
-                            .apply_block_connected_to(
-                                &block_event.block,
-                                block_event.block_height(),
-                                block_event.connected_to(),
-                            )
-                            .map_err(|e| Error::Generic(e.to_string()))?;
+                    while let Some(block_event) = emitter.next_block()? {
+                        wallet.apply_block_connected_to(
+                            &block_event.block,
+                            block_event.block_height(),
+                            block_event.connected_to(),
+                        )?;
                     }
 
-                    let mempool_txs = emitter.mempool().unwrap();
+                    let mempool_txs = emitter.mempool()?;
                     wallet.apply_unconfirmed_txs(mempool_txs);
                 }
             }
@@ -423,9 +416,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     client
                         .populate_tx_cache(wallet.tx_graph().full_txs().map(|tx_node| tx_node.tx));
 
-                    let update = client
-                        .sync(request, batch_size, false)
-                        .map_err(|e| Error::Generic(e.to_string()))?;
+                    let update = client.sync(request, batch_size, false)?;
                     wallet.apply_update(update)?;
                 }
                 #[cfg(feature = "esplora")]
@@ -436,28 +427,23 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     let update = client
                         .sync(request, parallel_requests)
                         .await
-                        .map_err(|e| Error::Generic(e.to_string()))?;
+                        .map_err(|e| *e)?;
                     wallet.apply_update(update)?;
                 }
                 #[cfg(feature = "rpc")]
                 RpcClient { client } => {
                     let wallet_cp = wallet.latest_checkpoint();
                     let mut emitter = Emitter::new(&client, wallet_cp.clone(), wallet_cp.height());
 
-                    while let Some(block_event) = emitter
-                        .next_block()
-                        .map_err(|e| Error::Generic(e.to_string()))?
-                    {
-                        wallet
-                            .apply_block_connected_to(
-                                &block_event.block,
-                                block_event.block_height(),
-                                block_event.connected_to(),
-                            )
-                            .map_err(|e| Error::Generic(e.to_string()))?;
+                    while let Some(block_event) = emitter.next_block()? {
+                        wallet.apply_block_connected_to(
+                            &block_event.block,
+                            block_event.block_height(),
+                            block_event.connected_to(),
+                        )?;
                     }
 
-                    let mempool_txs = emitter.mempool().unwrap();
+                    let mempool_txs = emitter.mempool()?;
                     wallet.apply_unconfirmed_txs(mempool_txs);
                 }
             }