From 44b0dfc53bb3677f9b3cf7528b040a4f997cb82b Mon Sep 17 00:00:00 2001
From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:02:18 +0000
Subject: [PATCH] fix: add excess to changeless `LowestFee` score

---
 src/metrics/lowest_fee.rs | 4 ++--
 tests/lowest_fee.rs       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/metrics/lowest_fee.rs b/src/metrics/lowest_fee.rs
index ca2d77a..2ec330a 100644
--- a/src/metrics/lowest_fee.rs
+++ b/src/metrics/lowest_fee.rs
@@ -35,12 +35,12 @@ where
     fn calc_metric(&self, cs: &CoinSelector<'_>, drain_weights: Option<DrainWeights>) -> f32 {
         self.calc_metric_lb(cs, drain_weights)
             + match drain_weights {
-                Some(_) => {
+                Some(_) => 0.0,
+                None => {
                     let selected_value = cs.selected_value();
                     assert!(selected_value >= self.target.value);
                     (cs.selected_value() - self.target.value) as f32
                 }
-                None => 0.0,
             }
     }
 
diff --git a/tests/lowest_fee.rs b/tests/lowest_fee.rs
index 511dc13..e16348f 100644
--- a/tests/lowest_fee.rs
+++ b/tests/lowest_fee.rs
@@ -156,6 +156,6 @@ fn combined_changeless_metric() {
         common::bnb_search(&mut cs_b, metric_combined, usize::MAX).expect("must find solution");
     println!("score={:?} rounds={}", combined_score, combined_rounds);
 
-    // [todo] shouldn't rounds be less since we are only considering changeless branches?
-    assert!(combined_rounds <= rounds);
+    // rounds is less since combined only considers changeless branches
+    assert!(rounds <= combined_rounds);
 }