Rename PsbtParams

Author: ValuedMammal

wallet/examples/psbt.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use bdk_chain::BlockId;
 use bdk_chain::ConfirmationBlockTime;
 use bdk_chain::TxUpdate;
-use bdk_wallet::psbt::params::{Params, SelectionStrategy::*};
+use bdk_wallet::psbt::{PsbtParams, SelectionStrategy::*};
 use bdk_wallet::test_utils::*;
 use bdk_wallet::{KeychainKind::*, Update, Wallet};
 use bitcoin::FeeRate;
@@ -49,7 +49,7 @@ fn main() -> anyhow::Result<()> {
         .collect::<HashMap<_, _>>();
 
     // Build params.
-    let mut params = Params::default();
+    let mut params = PsbtParams::default();
     let addr = Address::from_str(SEND_TO)?.require_network(NETWORK)?;
     let feerate = feerate_unchecked(FEERATE);
     params

wallet/src/psbt/mod.rs

@@ -17,8 +17,9 @@ use bitcoin::FeeRate;
 use bitcoin::Psbt;
 use bitcoin::TxOut;
 
-#[allow(unused)]
-pub mod params;
+mod params;
+
+pub use params::*;
 
 // TODO upstream the functions here to `rust-bitcoin`?
 

wallet/src/psbt/params.rs

@@ -8,7 +8,8 @@ use miniscript::plan::Assets;
 
 /// Parameters to create a PSBT.
 #[derive(Debug)]
-pub struct Params {
+#[allow(unused)]
+pub struct PsbtParams {
     // Inputs
     pub(crate) utxos: Vec<OutPoint>,
 
@@ -29,7 +30,7 @@ pub struct Params {
     pub(crate) fallback_sequence: Option<Sequence>,
 }
 
-impl Default for Params {
+impl Default for PsbtParams {
     fn default() -> Self {
         Self {
             utxos: Default::default(),
@@ -47,8 +48,8 @@ impl Default for Params {
     }
 }
 
-// TODO: more setters for Params
-impl Params {
+// TODO: more setters for PsbtParams
+impl PsbtParams {
     /// Add the spend [`Assets`].
     ///
     /// Assets are required to create a spending plan for an output controlled by the wallet's

wallet/src/wallet/mod.rs

@@ -2639,7 +2639,7 @@ use bdk_tx::{
 };
 use miniscript::plan::{Assets, Plan};
 
-use crate::psbt::params::{self as psbt_params, AssetsExt, SelectionStrategy};
+use crate::psbt::{AssetsExt, SelectionStrategy};
 
 /// Maps a chain position to tx confirmation status, if `pos` is the confirmed
 /// variant.
@@ -2687,7 +2687,7 @@ impl Wallet {
     /// Create PSBT with the given `params` and `rng`.
     pub fn create_psbt(
         &self,
-        params: psbt_params::Params,
+        params: crate::psbt::PsbtParams,
         rng: &mut impl RngCore,
     ) -> Result<(Psbt, Finalizer), CreatePsbtError> {
         // Get spend assets