fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-14 22:01:20 +00:00
Code Issues Projects Releases Wiki Activity

enterNewRound on HasAll

Browse Source
This commit is contained in:
Ethan Buchman
2016-12-19 20:12:37 -05:00
parent 706dd1d6c5
commit 8211fa6ce4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
consensus/state.go
View File

@ -655,10 +655,10 @@ func (cs *ConsensusState) timeoutRoutine() {
if ti.Step > 0 && newti.Step <= ti.Step { if ti.Step > 0 && newti.Step <= ti.Step {
// if we got here because we have all the votes, // if we got here because we have all the votes,
// fire the tock now instead of waiting for the timeout // fire the tock now instead of waiting for the timeout
if skipTimeoutCommit(newti) { /*if skipTimeoutCommit(newti) {
cs.timeoutTicker.Stop() cs.timeoutTicker.Stop()
go func(t timeoutInfo) { cs.tockChan <- t }(newti) go func(t timeoutInfo) { cs.tockChan <- t }(newti)
} }*/
continue continue
} }
} }
@ -1471,7 +1471,8 @@ func (cs *ConsensusState) addVote(vote *types.Vote, peerKey string) (added bool,
// if we have all the votes now, // if we have all the votes now,
// schedule the timeoutCommit to happen right away // schedule the timeoutCommit to happen right away
// NOTE: this won't apply if only one validator // NOTE: this won't apply if only one validator
cs.scheduleTimeout(time.Duration(0), cs.Height, 0, RoundStepNewHeight) // cs.scheduleTimeout(time.Duration(0), cs.Height, 0, RoundStepNewHeight)
cs.enterNewRound(cs.Height, 0)
} }
} }