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

Clean up of From traits implementations

Browse Source
This commit is contained in:
thunderbiscuit 2023-03-23 14:01:42 -04:00
parent 35d8fb3139
commit cba69e681a
No known key found for this signature in database
GPG Key ID: 88253696EB836462
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,8 @@ use crate::keys::{DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
use crate::psbt::PartiallySignedTransaction; use crate::psbt::PartiallySignedTransaction;
use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet}; use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet};
use bdk::bitcoin::blockdata::script::Script as BdkScript; use bdk::bitcoin::blockdata::script::Script as BdkScript;
use bdk::bitcoin::blockdata::transaction::TxIn as BdkTxIn;
use bdk::bitcoin::blockdata::transaction::TxOut as BdkTxOut;
use bdk::bitcoin::consensus::Decodable; use bdk::bitcoin::consensus::Decodable;
use bdk::bitcoin::psbt::serialize::Serialize; use bdk::bitcoin::psbt::serialize::Serialize;
use bdk::bitcoin::{ use bdk::bitcoin::{
@ -25,6 +27,7 @@ use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration};
use bdk::keys::bip39::WordCount; use bdk::keys::bip39::WordCount;
use bdk::wallet::AddressIndex as BdkAddressIndex; use bdk::wallet::AddressIndex as BdkAddressIndex;
use bdk::wallet::AddressInfo as BdkAddressInfo; use bdk::wallet::AddressInfo as BdkAddressInfo;
use bdk::LocalUtxo as BdkLocalUtxo;
use bdk::{Balance as BdkBalance, BlockTime, Error as BdkError, FeeRate, KeychainKind}; use bdk::{Balance as BdkBalance, BlockTime, Error as BdkError, FeeRate, KeychainKind};
use std::convert::From; use std::convert::From;
use std::fmt; use std::fmt;
@ -49,7 +52,7 @@ pub struct AddressInfo {
} }
impl From<BdkAddressInfo> for AddressInfo { impl From<BdkAddressInfo> for AddressInfo {
fn from(x: bdk::wallet::AddressInfo) -> AddressInfo { fn from(x: bdk::wallet::AddressInfo) -> Self {
AddressInfo { AddressInfo {
index: x.index, index: x.index,
address: x.address.to_string(), address: x.address.to_string(),
@ -85,7 +88,7 @@ pub enum AddressIndex {
} }
impl From<AddressIndex> for BdkAddressIndex { impl From<AddressIndex> for BdkAddressIndex {
fn from(x: AddressIndex) -> BdkAddressIndex { fn from(x: AddressIndex) -> Self {
match x { match x {
AddressIndex::New => BdkAddressIndex::New, AddressIndex::New => BdkAddressIndex::New,
AddressIndex::LastUnused => BdkAddressIndex::LastUnused, AddressIndex::LastUnused => BdkAddressIndex::LastUnused,
@ -143,7 +146,7 @@ pub struct OutPoint {
} }
impl From<&OutPoint> for BdkOutPoint { impl From<&OutPoint> for BdkOutPoint {
fn from(x: &OutPoint) -> BdkOutPoint { fn from(x: &OutPoint) -> Self {
BdkOutPoint { BdkOutPoint {
txid: Txid::from_str(&x.txid).unwrap(), txid: Txid::from_str(&x.txid).unwrap(),
vout: x.vout, vout: x.vout,
@ -188,8 +191,8 @@ pub struct TxOut {
script_pubkey: Arc<Script>, script_pubkey: Arc<Script>,
} }
impl From<&bdk::bitcoin::blockdata::transaction::TxOut> for TxOut { impl From<&BdkTxOut> for TxOut {
fn from(x: &bdk::bitcoin::blockdata::transaction::TxOut) -> Self { fn from(x: &BdkTxOut) -> Self {
TxOut { TxOut {
value: x.value, value: x.value,
script_pubkey: Arc::new(Script { script_pubkey: Arc::new(Script {
@ -206,8 +209,8 @@ pub struct LocalUtxo {
is_spent: bool, is_spent: bool,
} }
impl From<bdk::LocalUtxo> for LocalUtxo { impl From<BdkLocalUtxo> for LocalUtxo {
fn from(local_utxo: bdk::LocalUtxo) -> Self { fn from(local_utxo: BdkLocalUtxo) -> Self {
LocalUtxo { LocalUtxo {
outpoint: OutPoint { outpoint: OutPoint {
txid: local_utxo.outpoint.txid.to_string(), txid: local_utxo.outpoint.txid.to_string(),
@ -216,7 +219,7 @@ impl From<bdk::LocalUtxo> for LocalUtxo {
txout: TxOut { txout: TxOut {
value: local_utxo.txout.value, value: local_utxo.txout.value,
script_pubkey: Arc::new(Script { script_pubkey: Arc::new(Script {
script: local_utxo.txout.script_pubkey.clone(), script: local_utxo.txout.script_pubkey,
}), }),
}, },
keychain: local_utxo.keychain, keychain: local_utxo.keychain,
@ -257,8 +260,8 @@ pub struct TxIn {
pub witness: Vec<Vec<u8>>, pub witness: Vec<Vec<u8>>,
} }
impl From<&bdk::bitcoin::blockdata::transaction::TxIn> for TxIn { impl From<&BdkTxIn> for TxIn {
fn from(x: &bdk::bitcoin::blockdata::transaction::TxIn) -> TxIn { fn from(x: &BdkTxIn) -> Self {
TxIn { TxIn {
previous_output: OutPoint { previous_output: OutPoint {
txid: x.previous_output.txid.to_string(), txid: x.previous_output.txid.to_string(),

2
bdk-ffi/src/psbt.rs
View File

@ -35,8 +35,6 @@ impl PartiallySignedTransaction {
pub(crate) fn extract_tx(&self) -> Arc<Transaction> { pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
let tx = self.internal.lock().unwrap().clone().extract_tx(); let tx = self.internal.lock().unwrap().clone().extract_tx();
Arc::new(tx.into()) Arc::new(tx.into())
// let buffer: Vec<u8> = serialize(&tx);
// Arc::new(Transaction::new(buffer).unwrap())
} }
/// Combines this PartiallySignedTransaction with other PSBT as described by BIP 174. /// Combines this PartiallySignedTransaction with other PSBT as described by BIP 174.