Fixed Boundary Condition

sigp · Mar 25, 2022 · 38e8f98 · 38e8f98
1 parent d78b87e
commit 38e8f98
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/beacon_node/eth1/src/deposit_cache.rs b/beacon_node/eth1/src/deposit_cache.rs
@@ -368,12 +368,7 @@ impl DepositCache {
                 requested: end,
                 known_deposits: self.logs.len(),
             })
-        } else if self
-            .finalized_deposit_count
-            .map(|count| start - count + 1)
-            .unwrap_or(1)
-            == 0
-        {
+        } else if self.finalized_deposit_count.unwrap_or(0) > start {
             // Can't ask for deposits before or on the finalized deposit
             Err(Error::DepositRangeInvalid {
                 range_start: start,
@@ -638,8 +633,10 @@ pub mod tests {
         let block7 = fake_eth1_block(tree.get_log(7).expect("should return log"));
         tree.finalize(block7).expect("should finalize");
         // Range starts <= finalized deposit
-        assert!(tree.get_deposits(7, 9, 11).is_err());
         assert!(tree.get_deposits(6, 9, 11).is_err());
+        assert!(tree.get_deposits(7, 9, 11).is_err());
+        // Range start > finalized deposit should be OK
+        assert!(tree.get_deposits(8, 9, 11).is_ok());
     }
 
     fn fake_eth1_block(deposit_log: &DepositLog) -> Eth1Block {