Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Fix bad assumption when checking finalized descendant #1629

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Fix bad assumption when checking finalized descendant #1629

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
805cfde
Fix bad assumption when checking finalized desc.
paulhauner Sep 17, 2020
3957b03
Add regression test
paulhauner Sep 17, 2020
0de48ef
Return missing block error
paulhauner Sep 17, 2020
121e973
Add comment
paulhauner Sep 17, 2020
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
11 changes: 5 additions & 6 deletions consensus/fork_choice/src/fork_choice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,12 +745,11 @@ where

/// Returns a `ProtoBlock` if the block is known **and** a descendant of the finalized root.
pub fn get_block(&self, block_root: &Hash256) -> Option<ProtoBlock> {
self.proto_array.get_block(block_root).filter(|block| {
// If available, use the parent_root to perform the lookup since it will involve one
// less lookup. This involves making the assumption that the finalized block will
// always have `block.parent_root` of `None`.
self.is_descendant_of_finalized(block.parent_root.unwrap_or(block.root))
})
if self.is_descendant_of_finalized(*block_root) {
self.proto_array.get_block(block_root)
} else {
None
}
}

/// Return `true` if `block_root` is equal to the finalized root, or a known descendant of it.
Expand Down