Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fork tree prune assumptions removal v2 #13327

Merged
davxy merged 11 commits into from
Feb 15, 2023
Merged

Fork tree prune assumptions removal v2 #13327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc70262
Removed assumptions about ancestry from fork tree prune method
davxy Nov 25, 2022
f3c12b3
Tests improvement
davxy Dec 17, 2022
96db169
Fork tree prune refactory
davxy Dec 17, 2022
5c59fbc
Merge branch 'master' into fork-tree-prune-assumptions-removal
davxy Dec 17, 2022
d1951ad
Merge branch 'master' into fork-tree-prune-assumptions-removal
davxy Jan 13, 2023
f59fcc2
Code refactory
davxy Feb 7, 2023
e0c1a49
Merge branch 'master' into fork-tree-prune-assumptions-removal-v2
davxy Feb 7, 2023
4c00660
Correctly handle borderline, but legit, case
davxy Feb 7, 2023
96cb1e2
Apply suggestions from code review
davxy Feb 7, 2023
a7d6309
Removed duplicated test
davxy Feb 7, 2023
992cb3e
Merge branch 'master' into fork-tree-prune-assumptions-removal-v2
davxy Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/consensus/epochs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ mod tests {

let mut nodes: Vec<_> = epoch_changes.tree().iter().map(|(h, _, _)| h).collect();
nodes.sort();
assert_eq!(nodes, vec![b"A", b"B", b"C", b"E", b"F", b"G"]);
assert_eq!(nodes, vec![b"A", b"B", b"C", b"F", b"G"]);

// Finalize block y @ number 35, slot 330
// This should prune all nodes imported by blocks with a number < 35 that are not
Expand All @@ -1050,7 +1050,7 @@ mod tests {

let mut nodes: Vec<_> = epoch_changes.tree().iter().map(|(h, _, _)| h).collect();
nodes.sort();
assert_eq!(nodes, vec![b"B", b"C", b"F", b"G"]);
assert_eq!(nodes, vec![b"B", b"C", b"G"]);
}

#[test]
Expand Down
Loading