jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(tree): make remove_before bound inclusive (#10559)

Browse Source
This commit is contained in:
Dan Cline
2024-08-27 15:13:09 -04:00
committed by GitHub
parent 16577e0e01
commit b1d6e27e3f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/engine/tree/src/tree/mod.rs
View File

@ -176,10 +176,12 @@ impl TreeState {
true true
} }
/// Remove all blocks up to the given block number. /// Remove all blocks up to __and including__ the given block number.
pub(crate) fn remove_before(&mut self, upper_bound: Bound<BlockNumber>) { pub(crate) fn remove_before(&mut self, upper_bound: BlockNumber) {
let mut numbers_to_remove = Vec::new(); let mut numbers_to_remove = Vec::new();
for (&number, _) in self.blocks_by_number.range((Bound::Unbounded, upper_bound)) { for (&number, _) in
self.blocks_by_number.range((Bound::Unbounded, Bound::Included(upper_bound)))
{
numbers_to_remove.push(number); numbers_to_remove.push(number);
} }
@ -1019,7 +1021,7 @@ where
// state house keeping after backfill sync // state house keeping after backfill sync
// remove all executed blocks below the backfill height // remove all executed blocks below the backfill height
self.state.tree_state.remove_before(Bound::Included(backfill_height)); self.state.tree_state.remove_before(backfill_height);
self.metrics.executed_blocks.set(self.state.tree_state.block_count() as f64); self.metrics.executed_blocks.set(self.state.tree_state.block_count() as f64);
// remove all buffered blocks below the backfill height // remove all buffered blocks below the backfill height
@ -1193,9 +1195,7 @@ where
/// ///
/// Assumes that `finish` has been called on the `persistence_state` at least once /// Assumes that `finish` has been called on the `persistence_state` at least once
fn on_new_persisted_block(&mut self) { fn on_new_persisted_block(&mut self) {
self.state self.state.tree_state.remove_before(self.persistence_state.last_persisted_block_number);
.tree_state
.remove_before(Bound::Included(self.persistence_state.last_persisted_block_number));
self.canonical_in_memory_state self.canonical_in_memory_state
.remove_persisted_blocks(self.persistence_state.last_persisted_block_number); .remove_persisted_blocks(self.persistence_state.last_persisted_block_number);
} }
@ -2656,7 +2656,8 @@ mod tests {
tree_state.insert_executed(block.clone()); tree_state.insert_executed(block.clone());
} }
tree_state.remove_before(Bound::Excluded(3)); // inclusive bound, so we should remove anything up to and including 2
tree_state.remove_before(2);
assert!(!tree_state.blocks_by_hash.contains_key(&blocks[0].block.hash())); assert!(!tree_state.blocks_by_hash.contains_key(&blocks[0].block.hash()));
assert!(!tree_state.blocks_by_hash.contains_key(&blocks[1].block.hash())); assert!(!tree_state.blocks_by_hash.contains_key(&blocks[1].block.hash()));