chore: fix clippy warnings

diff --git a/src/error.rs b/src/error.rs
index ee353ea400b5d3f93b7f298989f31bcb5a19cd07..3690d4f0193785ed3093e48045bc2ee23779fb13 100644 (file)
--- 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<bdk_wallet::rusqlite::Error>),
 
     #[cfg(feature = "redb")]
     #[error("Redb StoreError: {0}")]
-    RedbStoreError(#[from] bdk_redb::error::StoreError),
+    RedbStoreError(Box<bdk_redb::error::StoreError>),
 
     #[cfg(feature = "redb")]
     #[error("Redb dabtabase error: {0}")]
-    RedbDatabaseError(#[from] bdk_redb::redb::DatabaseError),
+    RedbDatabaseError(Box<bdk_redb::redb::DatabaseError>),
 
     #[error("Serde json error: {0}")]
     SerdeJson(#[from] serde_json::Error),
@@ -147,3 +147,24 @@ impl From<ExtractTxError> for BDKCliError {
         BDKCliError::PsbtExtractTxError(Box::new(value))
     }
 }
+
+#[cfg(feature = "redb")]
+impl From<bdk_redb::error::StoreError> for BDKCliError {
+    fn from(err: bdk_redb::error::StoreError) -> Self {
+        BDKCliError::RedbStoreError(Box::new(err))
+    }
+}
+
+#[cfg(feature = "redb")]
+impl From<bdk_redb::redb::DatabaseError> for BDKCliError {
+    fn from(err: bdk_redb::redb::DatabaseError) -> Self {
+        BDKCliError::RedbDatabaseError(Box::new(err))
+    }
+}
+
+#[cfg(feature = "sqlite")]
+impl From<bdk_wallet::rusqlite::Error> 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 8873e3f10b1fffe3ffd6efa1d5850e3ed5dffafb..e14f97c7a03a68c4bb34e6446b2bddb329f3a136 100644 (file)
--- a/src/payjoin/mod.rs
+++ b/src/payjoin/mod.rs
@@ -75,7 +75,7 @@ impl<'a> PayjoinManager<'a> {
         let persister = payjoin::persist::NoopSessionPersister::<ReceiverSessionEvent>::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}"
                     )));
                 }
             }