fix bug, replace wet code with DRY composition

zancas · Mar 31, 2024 · 3493715 · 3493715
1 parent 65cb364
commit 3493715
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/zingo-status/src/confirmation_status.rs b/zingo-status/src/confirmation_status.rs
@@ -95,7 +95,9 @@ impl ConfirmationStatus {
     /// ```
     pub fn is_confirmed_before_or_at(&self, comparison_height: &BlockHeight) -> bool {
         match self {
-            Self::Confirmed(self_height) => self_height <= comparison_height,
+            Self::Confirmed(self_height) => {
+                self.is_confirmed_before(comparison_height) || self_height == comparison_height
+            }
             _ => false,
         }
     }
@@ -117,7 +119,7 @@ impl ConfirmationStatus {
     /// ```
     pub fn is_confirmed_before(&self, comparison_height: &BlockHeight) -> bool {
         match self {
-            Self::Confirmed(self_height) => self_height <= comparison_height,
+            Self::Confirmed(self_height) => self_height < comparison_height,
             _ => false,
         }
     }