]> Untitled Git - bdk-cli/commitdiff
fix(handler): replace panics with propagated errors
authorBrendon Votteler <bvotteler@users.noreply.github.com>
Fri, 13 Nov 2026 08:06:14 +0000 (10:06 +0200)
committerBrendon Votteler <bvotteler@users.noreply.github.com>
Mon, 16 Nov 2026 19:51:05 +0000 (21:51 +0200)
Remove .expect() and unimplemented!() calls
and replace them with errors. Wrap errors
from derive_sp(). Return generic errors for
the remaining cases.

src/error.rs
src/handlers/offline.rs

index 04d1ce6bae7ede640373ecdcff07eba983efb82c..3a5b89aa7bfd80b3ad0dda0b67f88a75347e701f 100644 (file)
@@ -31,6 +31,10 @@ pub enum BDKCliError {
     #[error("Silent payment address decoding error: {0}")]
     SilentPaymentParseError(#[from] bdk_sp::encoding::ParseError),
 
+    #[cfg(feature = "silent-payments")]
+    #[error("Cannot create silent payment transaction: {0}")]
+    SilentPaymentSendError(#[from] bdk_sp::send::error::SpSendError),
+
     #[error("Descriptor error: {0}")]
     DescriptorError(#[from] bdk_wallet::descriptor::error::Error),
 
index 5250c67386c2bea63c934bb733fa14bb574d62ea..9aa15fcb9fc1c63f0fe8ad8056c4980f9f5dc04a 100644 (file)
@@ -500,24 +500,33 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateSpTxCommand {
             .as_key_map(&secp);
         external_signers.extend(internal_signers);
 
-        match external_signers.iter().next().expect("not empty") {
+        let external_signer = external_signers
+            .iter()
+            .next()
+            .ok_or_else(|| Error::Generic("No signers found in wallet".to_string()))?;
+
+        match external_signer {
             (DescriptorPublicKey::Single(single_pub), DescriptorSecretKey::Single(prv)) => {
                 match single_pub.key {
                     SinglePubKey::FullKey(pk) => {
                         let keys: HashMap<PublicKey, PrivateKey> = [(pk, prv.key)].into();
-                        derive_sp(&mut psbt, &keys, &sp_recipients, &secp).expect("will fix later");
+                        derive_sp(&mut psbt, &keys, &sp_recipients, &secp)?;
                     }
                     SinglePubKey::XOnly(xonly) => {
                         let keys: HashMap<bdk_sp::bitcoin::XOnlyPublicKey, PrivateKey> =
                             [(xonly, prv.key)].into();
-                        derive_sp(&mut psbt, &keys, &sp_recipients, &secp).expect("will fix later");
+                        derive_sp(&mut psbt, &keys, &sp_recipients, &secp)?;
                     }
                 };
             }
             (_, DescriptorSecretKey::XPrv(k)) => {
-                derive_sp(&mut psbt, &k.xkey, &sp_recipients, &secp).expect("will fix later");
+                derive_sp(&mut psbt, &k.xkey, &sp_recipients, &secp)?;
+            }
+            _ => {
+                return Err(Error::Generic(
+                    "Multi xkey signer not implemented".to_string(),
+                ));
             }
-            _ => unimplemented!("multi xkey signer"),
         };
 
         // Unfinalize PSBT to resign