wip

src/branch_and_bound.rs

@@ -793,7 +793,7 @@ mod tests {
             }
 
             Ok(())
-        }).seed(0x13de95f300000373);
+        });
     }
 
     #[test]
@@ -884,10 +884,10 @@ mod tests {
 
             let mut gen = exhaustigen::Gen::new();
 
-            let mut solutions: Vec<_> = Vec::new();
+            let mut solutions: Vec<Vec<&Utxo>> = Vec::new();
             while !gen.done() {
                 let subset = gen.gen_subset(&pool.utxos).collect::<Vec<_>>();
-                let subset_sum: SignedAmount = subset
+                let subset_sum = subset
                     .iter()
                     .map(|u| {
                         effective_value(
@@ -897,13 +897,13 @@ mod tests {
                         )})
                     .filter(|e| e.is_some())
                     .map(|u| u.unwrap())
-                    .sum();
-
-                if subset_sum.is_positive() {
-                    let sum: Amount = subset_sum.to_unsigned().unwrap();
+                    .checked_sum();
 
-                    if sum >= target && sum <= target + cost_of_change {
-                        solutions.push(subset);
+                if let Some(s) = subset_sum {
+                    if let Ok(sum) = s.to_unsigned() {
+                        if sum >= target && sum <= target + cost_of_change {
+                            solutions.push(subset);
+                        }
                     }
                 }
             }
@@ -916,8 +916,8 @@ mod tests {
                 &pool.utxos,
             );
 
-            if solutions.is_empty() {
-                assert!(result.is_none() || result.unwrap().collect::<Vec<_>>().is_empty());
+            if solutions.is_empty() || target == Amount::ZERO {
+                assert!(result.is_none());
             } else {
                 let iter = result.unwrap();