diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs index 2a69c0c..038ec19 100644 --- a/bdk-ffi/src/bitcoin.rs +++ b/bdk-ffi/src/bitcoin.rs @@ -186,20 +186,16 @@ impl From<&Transaction> for BdkTransaction { } } -pub struct Psbt { - pub(crate) inner: Mutex, -} +pub struct Psbt(pub(crate) Mutex); impl Psbt { pub(crate) fn new(psbt_base64: String) -> Result { let psbt: BdkPsbt = BdkPsbt::from_str(&psbt_base64)?; - Ok(Psbt { - inner: Mutex::new(psbt), - }) + Ok(Psbt(Mutex::new(psbt))) } pub(crate) fn serialize(&self) -> String { - let psbt = self.inner.lock().unwrap().clone(); + let psbt = self.0.lock().unwrap().clone(); psbt.to_string() } @@ -210,7 +206,7 @@ impl Psbt { // } pub(crate) fn extract_tx(&self) -> Result, ExtractTxError> { - let tx: BdkTransaction = self.inner.lock().unwrap().clone().extract_tx()?; + let tx: BdkTransaction = self.0.lock().unwrap().clone().extract_tx()?; let transaction: Transaction = tx.into(); Ok(Arc::new(transaction)) } @@ -254,9 +250,7 @@ impl Psbt { impl From for Psbt { fn from(psbt: BdkPsbt) -> Self { - Psbt { - inner: Mutex::new(psbt), - } + Psbt(Mutex::new(psbt)) } } diff --git a/bdk-ffi/src/wallet.rs b/bdk-ffi/src/wallet.rs index 4a66718..d81f1a3 100644 --- a/bdk-ffi/src/wallet.rs +++ b/bdk-ffi/src/wallet.rs @@ -95,7 +95,7 @@ impl Wallet { psbt: Arc, // sign_options: Option, ) -> Result { - let mut psbt = psbt.inner.lock().unwrap(); + let mut psbt = psbt.0.lock().unwrap(); self.get_wallet() .sign(&mut psbt, SignOptions::default()) .map_err(SignerError::from)