mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-09 13:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
William Banfield
2022-01-19 12:30:44 -05:00
parent a33e38cb3a
commit 2eb38fd0c5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/state.go
View File

@@ -7,6 +7,7 @@ import (
"io/ioutil"
"os"
"runtime/debug"
"sort"
"time"
"github.com/gogo/protobuf/proto"
@@ -2274,8 +2275,6 @@ func (cs *State) checkDoubleSigningRisk(height int64) error {
return nil
}
<<<<<<< HEAD:consensus/state.go
=======
func (cs *State) calculatePrevoteMessageDelayMetrics() {
if cs.Proposal == nil {
return
@@ -2301,7 +2300,6 @@ func (cs *State) calculatePrevoteMessageDelayMetrics() {
}
}
>>>>>>> b6307c42e (consensus: check proposal non-nil in prevote message delay metric (#7625)):internal/consensus/state.go
//---------------------------------------------------------
func CompareHRS(h1 int64, r1 int32, s1 cstypes.RoundStepType, h2 int64, r2 int32, s2 cstypes.RoundStepType) int {