From: Brendon Votteler Date: Fri, 13 Nov 2026 08:06:14 +0000 (+0200) Subject: fix(handler): replace panics with propagated errors X-Git-Url: http://internal-gitweb-vhost/-script/src/consensus/example_cli/struct.EncoderStringWriter.html?a=commitdiff_plain;h=d73e0c8f13985113ce580a56fc198d749d469de4;p=bdk-cli fix(handler): replace panics with propagated errors Remove .expect() and unimplemented!() calls and replace them with errors. Wrap errors from derive_sp(). Return generic errors for the remaining cases. --- diff --git a/src/error.rs b/src/error.rs index 04d1ce6..3a5b89a 100644 --- a/src/error.rs +++ b/src/error.rs @@ -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), diff --git a/src/handlers/offline.rs b/src/handlers/offline.rs index 5250c67..9aa15fc 100644 --- a/src/handlers/offline.rs +++ b/src/handlers/offline.rs @@ -500,24 +500,33 @@ impl AppCommand>> 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 = [(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 = [(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