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

ref(wallet): Wallet::preselect_utxos now accepts a &TxParams

Browse Source 
to reduce the number of required function args in order to satisfy
`clippy::too_many_arguments`
This commit is contained in:
vmammal 2023-11-10 10:54:56 -05:00
parent f11d663b7e
commit 097d818d4c
No known key found for this signature in database
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/bdk/src/wallet/mod.rs
View File

@ -12,7 +12,7 @@
//! Wallet //! Wallet
//! //!
//! This module defines the [`Wallet`]. //! This module defines the [`Wallet`].
use crate::collections::{BTreeMap, HashMap, HashSet}; use crate::collections::{BTreeMap, HashMap};
use alloc::{ use alloc::{
boxed::Box, boxed::Box,
string::{String, ToString}, string::{String, ToString},
@ -1518,15 +1518,8 @@ impl<D> Wallet<D> {
return Err(CreateTxError::ChangePolicyDescriptor); return Err(CreateTxError::ChangePolicyDescriptor);
} }
let (required_utxos, optional_utxos) = self.preselect_utxos( let (required_utxos, optional_utxos) =
params.change_policy, self.preselect_utxos(&params, Some(current_height.to_consensus_u32()));
&params.unspendable,
params.utxos.clone(),
params.drain_wallet,
params.manually_selected_only,
params.bumping_fee.is_some(), // we mandate confirmed transactions if we're bumping the fee
Some(current_height.to_consensus_u32()),
);
// get drain script // get drain script
let drain_script = match params.drain_to { let drain_script = match params.drain_to {
@ -2063,17 +2056,26 @@ impl<D> Wallet<D> {
/// Given the options returns the list of utxos that must be used to form the /// Given the options returns the list of utxos that must be used to form the
/// transaction and any further that may be used if needed. /// transaction and any further that may be used if needed.
#[allow(clippy::too_many_arguments)]
fn preselect_utxos( fn preselect_utxos(
&self, &self,
change_policy: tx_builder::ChangeSpendPolicy, params: &TxParams,
unspendable: &HashSet<OutPoint>,
manually_selected: Vec<WeightedUtxo>,
must_use_all_available: bool,
manual_only: bool,
must_only_use_confirmed_tx: bool,
current_height: Option<u32>, current_height: Option<u32>,
) -> (Vec<WeightedUtxo>, Vec<WeightedUtxo>) { ) -> (Vec<WeightedUtxo>, Vec<WeightedUtxo>) {
let TxParams {
change_policy,
unspendable,
utxos,
drain_wallet,
manually_selected_only,
bumping_fee,
..
} = params;
let manually_selected = utxos.clone();
// we mandate confirmed transactions if we're bumping the fee
let must_only_use_confirmed_tx = bumping_fee.is_some();
let must_use_all_available = *drain_wallet;
let chain_tip = self.chain.tip().block_id(); let chain_tip = self.chain.tip().block_id();
// must_spend <- manually selected utxos // must_spend <- manually selected utxos
// may_spend <- all other available utxos // may_spend <- all other available utxos
@ -2088,7 +2090,7 @@ impl<D> Wallet<D> {
// NOTE: we are intentionally ignoring `unspendable` here. i.e manual // NOTE: we are intentionally ignoring `unspendable` here. i.e manual
// selection overrides unspendable. // selection overrides unspendable.
if manual_only { if *manually_selected_only {
return (must_spend, vec![]); return (must_spend, vec![]);
} }