From c877ced7dd0846e6be2d1a105992313b4f527b05 Mon Sep 17 00:00:00 2001 From: andreasgriffin Date: Thu, 1 Aug 2024 16:11:44 +0200 Subject: [PATCH] map to OtherPsbtErr otherwise uniffi is giving a warning --- bdk-ffi/src/bdk.udl | 1 - bdk-ffi/src/bitcoin.rs | 2 +- bdk-ffi/src/error.rs | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl index 4adc9d54..01c0e757 100644 --- a/bdk-ffi/src/bdk.udl +++ b/bdk-ffi/src/bdk.udl @@ -193,7 +193,6 @@ interface PersistenceError { [Error] interface PsbtError { InvalidMagic(); - FinalizeError(); MissingUtxo(); InvalidSeparator(); PsbtUtxoOutOfBounds(); diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs index ceb8411b..420747cb 100644 --- a/bdk-ffi/src/bitcoin.rs +++ b/bdk-ffi/src/bitcoin.rs @@ -230,7 +230,7 @@ impl Psbt { let result = self.0.lock().unwrap().clone().finalize(&secp); match result { Ok(psbt) => Ok(Arc::new(Psbt::from(psbt))), - Err((_psbt, _errors)) => Err(PsbtError::FinalizeError), + Err((_psbt, _errors)) => Err(PsbtError::OtherPsbtErr), } } diff --git a/bdk-ffi/src/error.rs b/bdk-ffi/src/error.rs index 2dea5f0f..1e9313b9 100644 --- a/bdk-ffi/src/error.rs +++ b/bdk-ffi/src/error.rs @@ -453,9 +453,6 @@ pub enum PsbtError { #[error("invalid magic")] InvalidMagic, - #[error("finalize error with errors")] - FinalizeError, - #[error("UTXO information is not present in PSBT")] MissingUtxo,