From: Vihiga Tyonum Date: Tue, 6 Jan 2026 11:50:38 +0000 (+0100) Subject: chore: fix clippy warnings X-Git-Url: http://internal-gitweb-vhost/%22https:/parse/scripts/wallet/struct.CommandStringError.html?a=commitdiff_plain;h=e849f8e315a24267b2cd9c4c6a5d37a3d9c323d0;p=bdk-cli chore: fix clippy warnings --- diff --git a/src/error.rs b/src/error.rs index ee353ea..3690d4f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -59,15 +59,15 @@ pub enum BDKCliError { #[cfg(feature = "sqlite")] #[error("Rusqlite error: {0}")] - RusqliteError(#[from] bdk_wallet::rusqlite::Error), + RusqliteError(Box), #[cfg(feature = "redb")] #[error("Redb StoreError: {0}")] - RedbStoreError(#[from] bdk_redb::error::StoreError), + RedbStoreError(Box), #[cfg(feature = "redb")] #[error("Redb dabtabase error: {0}")] - RedbDatabaseError(#[from] bdk_redb::redb::DatabaseError), + RedbDatabaseError(Box), #[error("Serde json error: {0}")] SerdeJson(#[from] serde_json::Error), @@ -147,3 +147,24 @@ impl From for BDKCliError { BDKCliError::PsbtExtractTxError(Box::new(value)) } } + +#[cfg(feature = "redb")] +impl From for BDKCliError { + fn from(err: bdk_redb::error::StoreError) -> Self { + BDKCliError::RedbStoreError(Box::new(err)) + } +} + +#[cfg(feature = "redb")] +impl From for BDKCliError { + fn from(err: bdk_redb::redb::DatabaseError) -> Self { + BDKCliError::RedbDatabaseError(Box::new(err)) + } +} + +#[cfg(feature = "sqlite")] +impl From for BDKCliError { + fn from(err: bdk_wallet::rusqlite::Error) -> Self { + BDKCliError::RusqliteError(Box::new(err)) + } +} diff --git a/src/payjoin/mod.rs b/src/payjoin/mod.rs index 8873e3f..e14f97c 100644 --- a/src/payjoin/mod.rs +++ b/src/payjoin/mod.rs @@ -75,7 +75,7 @@ impl<'a> PayjoinManager<'a> { let persister = payjoin::persist::NoopSessionPersister::::default(); let checked_max_fee_rate = max_fee_rate - .map(|rate| FeeRate::from_sat_per_kwu(rate)) + .map(FeeRate::from_sat_per_kwu) .unwrap_or(FeeRate::BROADCAST_MIN); let receiver = payjoin::receive::v2::ReceiverBuilder::new( @@ -275,7 +275,7 @@ impl<'a> PayjoinManager<'a> { .await } ReceiveSession::HasReplyableError(error) => self.handle_error(error, persister).await, - ReceiveSession::Closed(_) => return Err(Error::Generic("Session closed".to_string())), + ReceiveSession::Closed(_) => Err(Error::Generic("Session closed".to_string())), } } @@ -305,8 +305,7 @@ impl<'a> PayjoinManager<'a> { } Err(e) => { return Err(Error::Generic(format!( - "Error occurred when polling for Payjoin proposal from the directory: {}", - e.to_string() + "Error occurred when polling for Payjoin proposal from the directory: {e}" ))); } }