diff --git a/crates/bdk/src/types.rs b/crates/bdk/src/types.rs index 2a88cc37..b52635e5 100644 --- a/crates/bdk/src/types.rs +++ b/crates/bdk/src/types.rs @@ -161,7 +161,7 @@ impl Vbytes for usize { /// /// [`Wallet`]: crate::Wallet #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash)] -pub struct LocalUtxo { +pub struct LocalOutput { /// Reference to a transaction output pub outpoint: OutPoint, /// Transaction output @@ -192,7 +192,7 @@ pub struct WeightedUtxo { /// An unspent transaction output (UTXO). pub enum Utxo { /// A UTXO owned by the local wallet. - Local(LocalUtxo), + Local(LocalOutput), /// A UTXO owned by another wallet. Foreign { /// The location of the output. diff --git a/crates/bdk/src/wallet/coin_selection.rs b/crates/bdk/src/wallet/coin_selection.rs index a29456fa..bc4c719a 100644 --- a/crates/bdk/src/wallet/coin_selection.rs +++ b/crates/bdk/src/wallet/coin_selection.rs @@ -755,7 +755,7 @@ mod test { .unwrap(); WeightedUtxo { satisfaction_weight: P2WPKH_SATISFACTION_SIZE, - utxo: Utxo::Local(LocalUtxo { + utxo: Utxo::Local(LocalOutput { outpoint, txout: TxOut { value, @@ -815,7 +815,7 @@ mod test { for _ in 0..utxos_number { res.push(WeightedUtxo { satisfaction_weight: P2WPKH_SATISFACTION_SIZE, - utxo: Utxo::Local(LocalUtxo { + utxo: Utxo::Local(LocalOutput { outpoint: OutPoint::from_str( "ebd9813ecebc57ff8f30797de7c205e3c7498ca950ea4341ee51a685ff2fa30a:0", ) @@ -844,7 +844,7 @@ mod test { fn generate_same_value_utxos(utxos_value: u64, utxos_number: usize) -> Vec { let utxo = WeightedUtxo { satisfaction_weight: P2WPKH_SATISFACTION_SIZE, - utxo: Utxo::Local(LocalUtxo { + utxo: Utxo::Local(LocalOutput { outpoint: OutPoint::from_str( "ebd9813ecebc57ff8f30797de7c205e3c7498ca950ea4341ee51a685ff2fa30a:0", ) diff --git a/crates/bdk/src/wallet/mod.rs b/crates/bdk/src/wallet/mod.rs index 240cc105..f479330f 100644 --- a/crates/bdk/src/wallet/mod.rs +++ b/crates/bdk/src/wallet/mod.rs @@ -737,7 +737,7 @@ impl Wallet { } /// Return the list of unspent outputs of this wallet - pub fn list_unspent(&self) -> impl Iterator + '_ { + pub fn list_unspent(&self) -> impl Iterator + '_ { self.indexed_graph .graph() .filter_chain_unspents( @@ -786,7 +786,7 @@ impl Wallet { /// Returns the utxo owned by this wallet corresponding to `outpoint` if it exists in the /// wallet's database. - pub fn get_utxo(&self, op: OutPoint) -> Option { + pub fn get_utxo(&self, op: OutPoint) -> Option { let (&spk_i, _) = self.indexed_graph.index.txout(op)?; self.indexed_graph .graph() @@ -1617,7 +1617,7 @@ impl Wallet { .max_satisfaction_weight() .unwrap(); WeightedUtxo { - utxo: Utxo::Local(LocalUtxo { + utxo: Utxo::Local(LocalOutput { outpoint: txin.previous_output, txout: txout.clone(), keychain, @@ -1944,7 +1944,7 @@ impl Wallet { descriptor.at_derivation_index(child).ok() } - fn get_available_utxos(&self) -> Vec<(LocalUtxo, usize)> { + fn get_available_utxos(&self) -> Vec<(LocalOutput, usize)> { self.list_unspent() .map(|utxo| { let keychain = utxo.keychain; @@ -2141,7 +2141,7 @@ impl Wallet { /// get the corresponding PSBT Input for a LocalUtxo pub fn get_psbt_input( &self, - utxo: LocalUtxo, + utxo: LocalOutput, sighash_type: Option, only_witness_utxo: bool, ) -> Result> @@ -2352,8 +2352,8 @@ fn new_local_utxo( keychain: KeychainKind, derivation_index: u32, full_txo: FullTxOut, -) -> LocalUtxo { - LocalUtxo { +) -> LocalOutput { + LocalOutput { outpoint: full_txo.outpoint, txout: full_txo.txout, is_spent: full_txo.spent_by.is_some(), diff --git a/crates/bdk/src/wallet/tx_builder.rs b/crates/bdk/src/wallet/tx_builder.rs index e99d2fe2..e3474209 100644 --- a/crates/bdk/src/wallet/tx_builder.rs +++ b/crates/bdk/src/wallet/tx_builder.rs @@ -53,7 +53,7 @@ use bitcoin::{absolute, script::PushBytes, OutPoint, ScriptBuf, Sequence, Transa use super::coin_selection::{CoinSelectionAlgorithm, DefaultCoinSelectionAlgorithm}; use super::ChangeSet; -use crate::types::{FeeRate, KeychainKind, LocalUtxo, WeightedUtxo}; +use crate::types::{FeeRate, KeychainKind, LocalOutput, WeightedUtxo}; use crate::wallet::CreateTxError; use crate::{Utxo, Wallet}; @@ -889,7 +889,7 @@ impl Default for ChangeSpendPolicy { } impl ChangeSpendPolicy { - pub(crate) fn is_satisfied_by(&self, utxo: &LocalUtxo) -> bool { + pub(crate) fn is_satisfied_by(&self, utxo: &LocalOutput) -> bool { match self { ChangeSpendPolicy::ChangeAllowed => true, ChangeSpendPolicy::OnlyChange => utxo.keychain == KeychainKind::Internal, @@ -994,11 +994,11 @@ mod test { ); } - fn get_test_utxos() -> Vec { + fn get_test_utxos() -> Vec { use bitcoin::hashes::Hash; vec![ - LocalUtxo { + LocalOutput { outpoint: OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), vout: 0, @@ -1009,7 +1009,7 @@ mod test { confirmation_time: ConfirmationTime::Unconfirmed { last_seen: 0 }, derivation_index: 0, }, - LocalUtxo { + LocalOutput { outpoint: OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), vout: 1, diff --git a/crates/bdk/tests/common.rs b/crates/bdk/tests/common.rs index ee8ed74e..3e0292a2 100644 --- a/crates/bdk/tests/common.rs +++ b/crates/bdk/tests/common.rs @@ -1,6 +1,6 @@ #![allow(unused)] -use bdk::{wallet::AddressIndex, KeychainKind, LocalUtxo, Wallet}; +use bdk::{wallet::AddressIndex, KeychainKind, LocalOutput, Wallet}; use bdk_chain::indexed_tx_graph::Indexer; use bdk_chain::{BlockId, ConfirmationTime}; use bitcoin::hashes::Hash;