UtxoFilter has a Default implementation that applies no filtering

Author: ValuedMammal

src/psbt/params.rs

@@ -34,7 +34,7 @@ pub struct PsbtParams {
     pub(crate) drain_wallet: bool,
     pub(crate) coin_selection: SelectionStrategy,
     pub(crate) canonical_params: CanonicalizationParams,
-    pub(crate) utxo_filter: Option<UtxoFilter>,
+    pub(crate) utxo_filter: UtxoFilter,
 
     // PSBT
     pub(crate) version: Option<Version>,
@@ -57,7 +57,7 @@ impl Default for PsbtParams {
             drain_wallet: Default::default(),
             coin_selection: Default::default(),
             canonical_params: Default::default(),
-            utxo_filter: None,
+            utxo_filter: Default::default(),
             version: Default::default(),
             locktime: Default::default(),
             fallback_sequence: Default::default(),
@@ -173,7 +173,7 @@ impl PsbtParams {
     where
         F: Fn(&FullTxOut<ConfirmationBlockTime>) -> bool + Send + Sync + 'static,
     {
-        self.utxo_filter = Some(UtxoFilter(Arc::new(exclude)));
+        self.utxo_filter = UtxoFilter(Arc::new(exclude));
         self
     }
 
@@ -229,6 +229,12 @@ pub(crate) struct UtxoFilter(
     pub Arc<dyn Fn(&FullTxOut<ConfirmationBlockTime>) -> bool + Send + Sync>,
 );
 
+impl Default for UtxoFilter {
+    fn default() -> Self {
+        Self(Arc::new(|_| false))
+    }
+}
+
 impl fmt::Debug for UtxoFilter {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "UtxoFilter")

src/wallet/mod.rs

@@ -2895,10 +2895,7 @@ impl Wallet {
         // Get input candidates
         let mut may_spend: Vec<Input> = self
             .filter_spendable(txouts.into_values(), &params, |txo| {
-                params
-                    .utxo_filter
-                    .as_ref()
-                    .is_some_and(|filter| (filter.0)(txo))
+                (params.utxo_filter.0)(txo)
             })
             .flat_map(|txo| self.plan_input(&txo, &assets))
             .collect();
@@ -3100,10 +3097,7 @@ impl Wallet {
                 // per replacement policy Rule 2.
                 to_replace.contains(&txo.outpoint.txid)
                     || txo.chain_position.is_unconfirmed()
-                    || params
-                        .utxo_filter
-                        .as_ref()
-                        .is_some_and(|filter| (filter.0)(txo))
+                    || (params.utxo_filter.0)(txo)
             })
             .flat_map(|txo| self.plan_input(&txo, &assets))
             .collect();