Skip to content

Fix possible regression issue caused by ProposeWaitEmptyBlockTimer #1774

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
merged 1 commit into from
Sep 18, 2019
Merged

Fix possible regression issue caused by ProposeWaitEmptyBlockTimer #1774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 2 deletions core/src/consensus/tendermint/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,8 +1232,15 @@ impl Worker {
TendermintState::ProposeWaitEmptyBlockTimer {
block,
} => {
cdebug!(ENGINE, "Empty proposal timer is finished, go to the prevote step and broadcast the block");
self.submit_proposal_block(block.as_ref());
if self.height == block.header().number() {
cdebug!(
ENGINE,
"Empty proposal timer is finished, go to the prevote step and broadcast the block"
);
self.submit_proposal_block(block.as_ref());
} else {
cwarn!(ENGINE, "Empty proposal timer was for previous height.");
}
}
_ => {
cwarn!(ENGINE, "Empty proposal timer was not cleared.");
Expand Down