refactor(wallet): make current_height field in filter_utxos not optional

There is no case in which current_height is None within create_tx.

Author: nymius

crates/wallet/src/wallet/mod.rs

@@ -1418,7 +1418,7 @@ impl Wallet {
         fee_amount += fee_rate * tx.weight();
 
         let (required_utxos, optional_utxos) =
-            self.filter_utxos(&params, Some(current_height.to_consensus_u32()));
+            self.filter_utxos(&params, current_height.to_consensus_u32());
 
         // get drain script
         let mut drain_index = Option::<(KeychainKind, u32)>::None;
@@ -1973,7 +1973,7 @@ impl Wallet {
     fn filter_utxos(
         &self,
         params: &TxParams,
-        current_height: Option<u32>,
+        current_height: u32,
     ) -> (Vec<WeightedUtxo>, Vec<WeightedUtxo>) {
         self
             // get all unspent UTxOs from wallet
@@ -1994,22 +1994,20 @@ impl Wallet {
                 params.bumping_fee.is_none() || local_output.chain_position.is_confirmed()
             })
             // only use UTxOs we posess and are mature if the origin tx is coinbase
-            .filter(|local_output| {
+            .filter(move |local_output| {
                 self.indexed_graph
                     .graph()
                     .get_tx(local_output.outpoint.txid)
                     .is_some_and(|tx| {
                         !tx.is_coinbase()
                             || (local_output.chain_position.is_confirmed()
-                                && current_height.is_some_and(|current_height| {
-                                    local_output
-                                        .chain_position
-                                        .confirmation_height_upper_bound()
-                                        .is_some_and(|local_output_height| {
-                                            current_height.saturating_sub(local_output_height)
-                                                >= COINBASE_MATURITY
-                                        })
-                                }))
+                                && local_output
+                                    .chain_position
+                                    .confirmation_height_upper_bound()
+                                    .is_some_and(|local_output_height| {
+                                        current_height.saturating_sub(local_output_height)
+                                            >= COINBASE_MATURITY
+                                    }))
                     })
             })
             // combine optional UTxOs with manually selected UTxOs