frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Remove unused Mutex on DescriptorPublicKey inner field

Browse Source
This commit is contained in:
thunderbiscuit 2023-08-11 10:39:33 -04:00
parent 7717ebb097
commit 4ae169f860
No known key found for this signature in database
GPG Key ID: 88253696EB836462
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bdk-ffi/src/descriptor.rs
View File

@ -1,3 +1,4 @@
use std::ops::Deref;
use crate::{BdkError, DescriptorPublicKey, DescriptorSecretKey}; use crate::{BdkError, DescriptorPublicKey, DescriptorSecretKey};
use bdk::bitcoin::secp256k1::Secp256k1; use bdk::bitcoin::secp256k1::Secp256k1;
use bdk::bitcoin::util::bip32::Fingerprint; use bdk::bitcoin::util::bip32::Fingerprint;
@ -11,7 +12,6 @@ use bdk::template::{
DescriptorTemplate, DescriptorTemplate,
}; };
use bdk::KeychainKind; use bdk::KeychainKind;
use std::ops::Deref;
use std::str::FromStr; use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
@ -61,9 +61,9 @@ impl Descriptor {
network: Network, network: Network,
) -> Self { ) -> Self {
let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap(); let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
let derivable_key = public_key.inner_mutex.lock().unwrap(); let derivable_key = &public_key.inner;
match derivable_key.deref() { match derivable_key {
BdkDescriptorPublicKey::XPub(descriptor_x_key) => { BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey; let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) = let (extended_descriptor, key_map, _) =
@ -112,9 +112,9 @@ impl Descriptor {
network: Network, network: Network,
) -> Self { ) -> Self {
let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap(); let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
let derivable_key = public_key.inner_mutex.lock().unwrap(); let derivable_key = &public_key.inner;
match derivable_key.deref() { match derivable_key {
BdkDescriptorPublicKey::XPub(descriptor_x_key) => { BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey; let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) = let (extended_descriptor, key_map, _) =
@ -163,9 +163,9 @@ impl Descriptor {
network: Network, network: Network,
) -> Self { ) -> Self {
let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap(); let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
let derivable_key = public_key.inner_mutex.lock().unwrap(); let derivable_key = &public_key.inner;
match derivable_key.deref() { match derivable_key {
BdkDescriptorPublicKey::XPub(descriptor_x_key) => { BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey; let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) = let (extended_descriptor, key_map, _) =
@ -214,9 +214,9 @@ impl Descriptor {
network: Network, network: Network,
) -> Self { ) -> Self {
let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap(); let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
let derivable_key = public_key.inner_mutex.lock().unwrap(); let derivable_key = &public_key.inner;
match derivable_key.deref() { match derivable_key {
BdkDescriptorPublicKey::XPub(descriptor_x_key) => { BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey; let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) = let (extended_descriptor, key_map, _) =

16
bdk-ffi/src/keys.rs
View File

@ -145,7 +145,7 @@ impl DescriptorSecretKey {
let secp = Secp256k1::new(); let secp = Secp256k1::new();
let descriptor_public_key = self.inner_mutex.lock().unwrap().to_public(&secp).unwrap(); let descriptor_public_key = self.inner_mutex.lock().unwrap().to_public(&secp).unwrap();
Arc::new(DescriptorPublicKey { Arc::new(DescriptorPublicKey {
inner_mutex: Mutex::new(descriptor_public_key), inner: descriptor_public_key,
}) })
} }
@ -171,7 +171,7 @@ impl DescriptorSecretKey {
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct DescriptorPublicKey { pub(crate) struct DescriptorPublicKey {
pub(crate) inner_mutex: Mutex<BdkDescriptorPublicKey>, pub(crate) inner: BdkDescriptorPublicKey,
} }
impl DescriptorPublicKey { impl DescriptorPublicKey {
@ -179,13 +179,13 @@ impl DescriptorPublicKey {
let descriptor_public_key = BdkDescriptorPublicKey::from_str(public_key.as_str()) let descriptor_public_key = BdkDescriptorPublicKey::from_str(public_key.as_str())
.map_err(|e| BdkError::Generic(e.to_string()))?; .map_err(|e| BdkError::Generic(e.to_string()))?;
Ok(Self { Ok(Self {
inner_mutex: Mutex::new(descriptor_public_key), inner: descriptor_public_key,
}) })
} }
pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> { pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
let secp = Secp256k1::new(); let secp = Secp256k1::new();
let descriptor_public_key = self.inner_mutex.lock().unwrap(); let descriptor_public_key = &self.inner;
let path = path.inner_mutex.lock().unwrap().deref().clone(); let path = path.inner_mutex.lock().unwrap().deref().clone();
match descriptor_public_key.deref() { match descriptor_public_key.deref() {
@ -202,7 +202,7 @@ impl DescriptorPublicKey {
wildcard: descriptor_x_key.wildcard, wildcard: descriptor_x_key.wildcard,
}); });
Ok(Arc::new(Self { Ok(Arc::new(Self {
inner_mutex: Mutex::new(derived_descriptor_public_key), inner: derived_descriptor_public_key,
})) }))
} }
BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic( BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
@ -212,7 +212,7 @@ impl DescriptorPublicKey {
} }
pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> { pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
let descriptor_public_key = self.inner_mutex.lock().unwrap(); let descriptor_public_key = &self.inner;
let path = path.inner_mutex.lock().unwrap().deref().clone(); let path = path.inner_mutex.lock().unwrap().deref().clone();
match descriptor_public_key.deref() { match descriptor_public_key.deref() {
BdkDescriptorPublicKey::XPub(descriptor_x_key) => { BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
@ -224,7 +224,7 @@ impl DescriptorPublicKey {
wildcard: descriptor_x_key.wildcard, wildcard: descriptor_x_key.wildcard,
}); });
Ok(Arc::new(Self { Ok(Arc::new(Self {
inner_mutex: Mutex::new(extended_descriptor_public_key), inner: extended_descriptor_public_key,
})) }))
} }
BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic( BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
@ -234,7 +234,7 @@ impl DescriptorPublicKey {
} }
pub(crate) fn as_string(&self) -> String { pub(crate) fn as_string(&self) -> String {
self.inner_mutex.lock().unwrap().to_string() self.inner.to_string()
} }
} }