wip

Author: yancyribbens

src/branch_and_bound.rs

@@ -172,7 +172,7 @@ pub fn select_coins_bnb<Utxo: WeightedUtxo>(
     let upper_bound = target.checked_add(cost_of_change)?;
 
     // Creates a tuple of (effective_value, waste, weighted_utxo)
-    let mut w_utxos: Vec<(u64, i64, &Utxo)> = weighted_utxos
+    let w_utxos = weighted_utxos
         .iter()
         // calculate effective_value and waste for each w_utxo.
         .map(|wu| (wu.effective_value(fee_rate), wu.waste(fee_rate, long_term_fee_rate), wu))
@@ -183,20 +183,24 @@ pub fn select_coins_bnb<Utxo: WeightedUtxo>(
         // filter out all effective_values that are negative.
         .filter(|(eff_val, _, _)| eff_val.is_positive())
         // all utxo effective_values are now positive (see previous step) - cast to unsigned.
-        .map(|(eff_val, waste, wu)| (eff_val.to_sat() as u64, waste.to_sat(), wu))
-        .collect();
+        .map(|(eff_val, waste, wu)| (eff_val.to_unsigned().unwrap(), waste, wu));
+
+    let available_value = w_utxos.clone().map(|(ev, _, _)| ev).checked_sum()?;
+
+    if available_value < target || target == Amount::ZERO {
+        return None;
+    }
+
+    let mut available_value = available_value.to_sat();
+
+    // cast from Amount/SignedAmount to u64/i64 for more perfomant operations.
+    let mut w_utxos: Vec<(u64, i64, &Utxo)> = w_utxos.map(|(e, w, u)| (e.to_sat(), w.to_sat(), u)).collect();
 
     // descending sort by effective_value using satisfaction weight as tie breaker.
     w_utxos.sort_by(|a, b| {
         b.0.cmp(&a.0).then(b.2.satisfaction_weight().cmp(&a.2.satisfaction_weight()))
     });
 
-    let mut available_value: u64 = w_utxos.clone().into_iter().map(|(ev, _, _)| ev).sum();
-
-    if available_value < target.to_sat() || target == Amount::ZERO {
-        return None;
-    }
-
     while iteration < ITERATION_LIMIT {
         backtrack = false;