mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-28 03:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

update heightvoteset constructor for strict vs non strict

Browse Source
This commit is contained in:
William Banfield
2022-05-16 11:27:45 -04:00
parent bd26649455
commit c2f543bebb
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/consensus/state.go
+5 -2
View File
@@ -845,8 +845,11 @@ func (cs *State) updateToState(state sm.State) {
cs.ValidRound = -1
cs.ValidBlock = nil
cs.ValidBlockParts = nil
requireExtensions := state.ConsensusParams.Vote.RequireExtensions(height)
cs.Votes = cstypes.NewHeightVoteSet(state.ChainID, height, validators, requireExtensions)
if state.ConsensusParams.Vote.RequireExtensions(height) {
cs.Votes = cstypes.NewStrictHeightVoteSet(state.ChainID, height, validators)
} else {
cs.Votes = cstypes.NewHeightVoteSet(state.ChainID, height, validators)
}
cs.CommitRound = -1
cs.LastValidators = state.LastValidators
cs.TriggeredTimeoutPrecommit = false
internal/consensus/types/height_vote_set.go
+11 -2
View File
@@ -49,10 +49,19 @@ type HeightVoteSet struct {
peerCatchupRounds map[types.NodeID][]int32 // keys: peer.ID; values: at most 2 rounds
}
func NewHeightVoteSet(chainID string, height int64, valSet *types.ValidatorSet, requireExtensions bool) *HeightVoteSet {
func NewHeightVoteSet(chainID string, height int64, valSet *types.ValidatorSet) *HeightVoteSet {
hvs := &HeightVoteSet{
chainID: chainID,
requireExtensions: requireExtensions,
requireExtensions: false,
}
hvs.Reset(height, valSet)
return hvs
}
func NewStrictHeightVoteSet(chainID string, height int64, valSet *types.ValidatorSet) *HeightVoteSet {
hvs := &HeightVoteSet{
chainID: chainID,
requireExtensions: true,
}
hvs.Reset(height, valSet)
return hvs
internal/consensus/types/height_vote_set_test.go
+1 -1
View File
@@ -27,7 +27,7 @@ func TestPeerCatchupRounds(t *testing.T) {
valSet, privVals := factory.ValidatorSet(ctx, t, 10, 1)
chainID := cfg.ChainID()
hvs := NewHeightVoteSet(chainID, 1, valSet, false)
hvs := NewHeightVoteSet(chainID, 1, valSet)
vote999_0 := makeVoteHR(ctx, t, 1, 0, 999, privVals, chainID)
added, err := hvs.AddVote(vote999_0, "peer1")