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

Remove unused NetworkLocalUtxo type

Browse Source
This commit is contained in:
thunderbiscuit
2023-03-23 12:21:18 -04:00
parent 6c561228c2
commit 2342265c26
4 changed files with 155 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bdk-ffi/Cargo.toml
View File

@@ -15,6 +15,9 @@ name = "bdkffi"
name = "uniffi-bindgen"
path = "uniffi-bindgen.rs"
[features]
default = ["uniffi/cli"]
[dependencies]
bdk = { version = "0.27.1", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled", "rpc"] }
uniffi = { version = "0.23.0" }

22
bdk-ffi/src/lib.rs
View File

@@ -194,7 +194,7 @@ pub struct TxOut {
}
impl From<&bdk::bitcoin::blockdata::transaction::TxOut> for TxOut {
fn from(x: &bdk::bitcoin::blockdata::transaction::TxOut) -> TxOut {
fn from(x: &bdk::bitcoin::blockdata::transaction::TxOut) -> Self {
TxOut {
value: x.value,
script_pubkey: Arc::new(Script {
@@ -211,25 +211,21 @@ pub struct LocalUtxo {
is_spent: bool,
}
trait NetworkLocalUtxo {
fn from_utxo(x: &bdk::LocalUtxo) -> LocalUtxo;
}
impl NetworkLocalUtxo for LocalUtxo {
fn from_utxo(x: &bdk::LocalUtxo) -> LocalUtxo {
impl From<bdk::LocalUtxo> for LocalUtxo {
fn from(local_utxo: bdk::LocalUtxo) -> Self {
LocalUtxo {
outpoint: OutPoint {
txid: x.outpoint.txid.to_string(),
vout: x.outpoint.vout,
txid: local_utxo.outpoint.txid.to_string(),
vout: local_utxo.outpoint.vout,
},
txout: TxOut {
value: x.txout.value,
value: local_utxo.txout.value,
script_pubkey: Arc::new(Script {
script: x.txout.script_pubkey.clone(),
script: local_utxo.txout.script_pubkey.clone(),
}),
},
keychain: x.keychain,
is_spent: x.is_spent,
keychain: local_utxo.keychain,
is_spent: local_utxo.is_spent,
}
}
}

24
bdk-ffi/src/wallet.rs
View File

@@ -17,8 +17,8 @@ use crate::database::DatabaseConfig;
use crate::descriptor::Descriptor;
use crate::psbt::PartiallySignedTransaction;
use crate::{
AddressIndex, AddressInfo, Balance, BdkError, LocalUtxo, NetworkLocalUtxo, OutPoint, Progress,
ProgressHolder, RbfValue, Script, ScriptAmount, TransactionDetails, TxBuilderResult,
AddressIndex, AddressInfo, Balance, BdkError, LocalUtxo, OutPoint, Progress, ProgressHolder,
RbfValue, Script, ScriptAmount, TransactionDetails, TxBuilderResult,
};
#[derive(Debug)]
@@ -132,7 +132,7 @@ impl Wallet {
/// which first needs to be Wallet.sync manually.
pub(crate) fn list_unspent(&self) -> Result<Vec<LocalUtxo>, BdkError> {
let unspents: Vec<BdkLocalUtxo> = self.get_wallet().list_unspent()?;
Ok(unspents.iter().map(LocalUtxo::from_utxo).collect())
Ok(unspents.into_iter().map(LocalUtxo::from).collect())
}
}
@@ -578,7 +578,7 @@ mod test {
// new index still 0
assert_eq!(
wallet
.get_address(crate::AddressIndex::New)
.get_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1qqjn9gky9mkrm3c28e5e87t5akd3twg6xezp0tv"
@@ -587,7 +587,7 @@ mod test {
// new index now 1
assert_eq!(
wallet
.get_address(crate::AddressIndex::New)
.get_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1q0xs7dau8af22rspp4klya4f7lhggcnqfun2y3a"
@@ -596,7 +596,7 @@ mod test {
// new index now 2
assert_eq!(
wallet
.get_address(crate::AddressIndex::New)
.get_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1q5g0mq6dkmwzvxscqwgc932jhgcxuqqkjv09tkj"
@@ -647,7 +647,7 @@ mod test {
assert_eq!(
wallet
.get_address(crate::AddressIndex::New)
.get_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1qqjn9gky9mkrm3c28e5e87t5akd3twg6xezp0tv"
@@ -655,7 +655,7 @@ mod test {
assert_eq!(
wallet
.get_address(crate::AddressIndex::New)
.get_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1q0xs7dau8af22rspp4klya4f7lhggcnqfun2y3a"
@@ -663,7 +663,7 @@ mod test {
assert_eq!(
wallet
.get_address(crate::AddressIndex::LastUnused)
.get_address(AddressIndex::LastUnused)
.unwrap()
.address,
"bcrt1q0xs7dau8af22rspp4klya4f7lhggcnqfun2y3a"
@@ -671,7 +671,7 @@ mod test {
assert_eq!(
wallet
.get_internal_address(crate::AddressIndex::New)
.get_internal_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1qpmz73cyx00r4a5dea469j40ax6d6kqyd67nnpj"
@@ -679,7 +679,7 @@ mod test {
assert_eq!(
wallet
.get_internal_address(crate::AddressIndex::New)
.get_internal_address(AddressIndex::New)
.unwrap()
.address,
"bcrt1qaux734vuhykww9632v8cmdnk7z2mw5lsf74v6k"
@@ -687,7 +687,7 @@ mod test {
assert_eq!(
wallet
.get_internal_address(crate::AddressIndex::LastUnused)
.get_internal_address(AddressIndex::LastUnused)
.unwrap()
.address,
"bcrt1qaux734vuhykww9632v8cmdnk7z2mw5lsf74v6k"