mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-07-31 04:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Divergences in comparison with #9620. Part 1: easy/obvious (#9888)

Browse Source 
* Obvious changes (including bugs)

* Update privval/file.go

Co-authored-by: Thane Thomson <connect@thanethomson.com>

Co-authored-by: Thane Thomson <connect@thanethomson.com>
This commit is contained in:
Sergio Mena
2022-12-16 12:16:53 +01:00
committed by GitHub
co-authored by Thane Thomson
parent 9eb3fb050b
commit a749afe8fb
12 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/block_test.go
+12 -12
View File
@@ -232,21 +232,21 @@ func TestCommit(t *testing.T) {
lastID := makeBlockIDRandom()
h := int64(3)
voteSet, _, vals := randVoteSet(h-1, 1, tmproto.PrecommitType, 10, 1)
commit, err := MakeExtCommit(lastID, h-1, 1, voteSet, vals, time.Now())
extCommit, err := MakeExtCommit(lastID, h-1, 1, voteSet, vals, time.Now())
require.NoError(t, err)
assert.Equal(t, h-1, commit.Height)
assert.EqualValues(t, 1, commit.Round)
assert.Equal(t, tmproto.PrecommitType, tmproto.SignedMsgType(commit.Type()))
if commit.Size() <= 0 {
t.Fatalf("commit %v has a zero or negative size: %d", commit, commit.Size())
assert.Equal(t, h-1, extCommit.Height)
assert.EqualValues(t, 1, extCommit.Round)
assert.Equal(t, tmproto.PrecommitType, tmproto.SignedMsgType(extCommit.Type()))
if extCommit.Size() <= 0 {
t.Fatalf("commit %v has a zero or negative size: %d", extCommit, extCommit.Size())
}
require.NotNil(t, commit.BitArray())
assert.Equal(t, bits.NewBitArray(10).Size(), commit.BitArray().Size())
require.NotNil(t, extCommit.BitArray())
assert.Equal(t, bits.NewBitArray(10).Size(), extCommit.BitArray().Size())
assert.Equal(t, voteSet.GetByIndex(0), commit.GetByIndex(0))
assert.True(t, commit.IsCommit())
assert.Equal(t, voteSet.GetByIndex(0), extCommit.GetByIndex(0))
assert.True(t, extCommit.IsCommit())
}
func TestCommitValidateBasic(t *testing.T) {
@@ -440,11 +440,11 @@ func randCommit(now time.Time) *Commit {
lastID := makeBlockIDRandom()
h := int64(3)
voteSet, _, vals := randVoteSet(h-1, 1, tmproto.PrecommitType, 10, 1)
commit, err := MakeExtCommit(lastID, h-1, 1, voteSet, vals, now)
extCommit, err := MakeExtCommit(lastID, h-1, 1, voteSet, vals, now)
if err != nil {
panic(err)
}
return commit.ToCommit()
return extCommit.ToCommit()
}
func hexBytesFromString(s string) bytes.HexBytes {
types/vote_set.go
+1 -1
View File
@@ -217,7 +217,7 @@ func (voteSet *VoteSet) addVote(vote *Vote) (added bool, err error) {
// Check signature.
if voteSet.extensionsEnabled {
if err := vote.VerifyVoteAndExtension(voteSet.chainID, val.PubKey); err != nil {
return false, fmt.Errorf("failed to verify vote with ChainID %s and PubKey %s: %w", voteSet.chainID, val.PubKey, err)
return false, fmt.Errorf("failed to verify extended vote with ChainID %s and PubKey %s: %w", voteSet.chainID, val.PubKey, err)
}
} else {
if err := vote.Verify(voteSet.chainID, val.PubKey); err != nil {