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

Allow to build_upon skipped entries, but don't walk back #635

Merged
rphmeier merged 2 commits into from
Aug 31, 2018
Merged

Allow to build_upon skipped entries, but don't walk back #635

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652a39f
Allow to build_upon skipped entries, but don't walk back
gnunicorn Aug 30, 2018
3b77e9a
Use existing calculated version
gnunicorn Aug 30, 2018
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
Prev Previous commit
Use existing calculated version
  • Loading branch information
@gnunicorn
gnunicorn committed Aug 30, 2018
commit 3b77e9aba2dfdb00e04691080b855b136e51a69f
2 changes: 1 addition & 1 deletion substrate/bft/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ impl<B, P, I> BftService<B, P, I>
let hash = header.hash();
let &(ref live_header, ref handle) = live;
match handle.status() {
_ if *header != *live_header && *live_header.parent_hash() != header.hash() => true, // can always follow with next block.
_ if *header != *live_header && *live_header.parent_hash() != hash => true, // can always follow with next block.
status::BAD => hash == live_header.hash(), // bad block can be re-agreed on.
_ => false, // canceled won't appear since we overwrite the handle before returning.
}
Expand Down