mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-01 21:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

consensus: fix consensus timeouts when using defaults

Browse Source
This commit is contained in:
William Banfield
2022-06-03 16:52:26 -04:00
parent 75a12ea0c6
commit f3a25d48a9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/consensus/state.go
+5 -2
View File
@@ -2796,7 +2796,8 @@ func (cs *State) voteTimeout(round int32) time.Duration {
}
func (cs *State) commitTime(t time.Time) time.Time {
c := cs.state.ConsensusParams.Timeout.Commit
tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
c := tp.Commit
if cs.config.UnsafeCommitTimeoutOverride != 0 {
c = cs.config.UnsafeProposeTimeoutOverride
}
@@ -2804,10 +2805,12 @@ func (cs *State) commitTime(t time.Time) time.Time {
}
func (cs *State) bypassCommitTimeout() bool {
tp := cs.state.ConsensusParams.Timeout.TimeoutParamsOrDefaults()
b := tp.BypassCommitTimeout
if cs.config.UnsafeBypassCommitTimeoutOverride != nil {
return *cs.config.UnsafeBypassCommitTimeoutOverride
}
return cs.state.ConsensusParams.Timeout.BypassCommitTimeout
return b
}
func (cs *State) calculateProposalTimestampDifferenceMetric() {