diff --git a/blocksync/reactor_test.go b/blocksync/reactor_test.go index 0cab3e36b..c40cd06a7 100644 --- a/blocksync/reactor_test.go +++ b/blocksync/reactor_test.go @@ -148,7 +148,7 @@ func newReactor( panic(fmt.Errorf("error apply block: %w", err)) } - blockStore.SaveBlock(thisBlock, thisParts, seenExtCommiqt) + blockStore.SaveBlock(thisBlock, thisParts, seenExtCommit) } bcReactor := NewReactor(state.Copy(), blockExec, blockStore, fastSync, NopMetrics()) diff --git a/consensus/common_test.go b/consensus/common_test.go index 55bcefa34..ebdc60f9b 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -134,7 +134,7 @@ func (vs *validatorStub) signVote( func signVote(vs *validatorStub, voteType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { var ext []byte // Only non-nil precommits are allowed to carry vote extensions. - if voteType == tmproto.PrecommitType && !blockID.IsNil() { + if voteType == tmproto.PrecommitType && len(hash) != 0 { ext = []byte("extension") } v, err := vs.signVote(voteType, hash, header, ext) diff --git a/evidence/verify_test.go b/evidence/verify_test.go index fd955b39a..3380de313 100644 --- a/evidence/verify_test.go +++ b/evidence/verify_test.go @@ -14,6 +14,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/evidence" "github.com/tendermint/tendermint/evidence/mocks" + "github.com/tendermint/tendermint/internal/test" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmversion "github.com/tendermint/tendermint/proto/tendermint/version" @@ -207,7 +208,7 @@ func TestVerifyLightClientAttack_Equivocation(t *testing.T) { // except the last validator vote twice blockID := makeBlockID(conflictingHeader.Hash(), 1000, []byte("partshash")) voteSet := types.NewVoteSet(evidenceChainID, 10, 1, tmproto.SignedMsgType(2), conflictingVals) - extCommit, err := types.MakeExtendedCommit(blockID, 10, 1, voteSet, conflictingPrivVals[:4], defaultEvidenceTime) + extCommit, err := test.MakeExtendedCommitFromVoteSet(blockID, voteSet, conflictingPrivVals[:4], defaultEvidenceTime) require.NoError(t, err) commit := extCommit.StripExtensions() ev := &types.LightClientAttackEvidence{ @@ -226,7 +227,7 @@ func TestVerifyLightClientAttack_Equivocation(t *testing.T) { trustedBlockID := makeBlockID(trustedHeader.Hash(), 1000, []byte("partshash")) trustedVoteSet := types.NewVoteSet(evidenceChainID, 10, 1, tmproto.SignedMsgType(2), conflictingVals) - trustedExtCommit, err := types.MakeExtendedCommit(trustedBlockID, 10, 1, trustedVoteSet, conflictingPrivVals, defaultEvidenceTime) + trustedExtCommit, err := test.MakeExtendedCommitFromVoteSet(trustedBlockID, trustedVoteSet, conflictingPrivVals, defaultEvidenceTime) require.NoError(t, err) trustedCommit := trustedExtCommit.StripExtensions() trustedSignedHeader := &types.SignedHeader{ @@ -293,7 +294,7 @@ func TestVerifyLightClientAttack_Amnesia(t *testing.T) { // except the last validator vote twice. However this time the commits are of different rounds. blockID := makeBlockID(conflictingHeader.Hash(), 1000, []byte("partshash")) voteSet := types.NewVoteSet(evidenceChainID, 10, 0, tmproto.SignedMsgType(2), conflictingVals) - extCommit, err := types.MakeExtendedCommit(blockID, 10, 0, voteSet, conflictingPrivVals, defaultEvidenceTime) + extCommit, err := test.MakeExtendedCommitFromVoteSet(blockID, voteSet, conflictingPrivVals, defaultEvidenceTime) require.NoError(t, err) commit := extCommit.StripExtensions() ev := &types.LightClientAttackEvidence{ @@ -312,7 +313,7 @@ func TestVerifyLightClientAttack_Amnesia(t *testing.T) { trustedBlockID := makeBlockID(trustedHeader.Hash(), 1000, []byte("partshash")) trustedVoteSet := types.NewVoteSet(evidenceChainID, 10, 1, tmproto.SignedMsgType(2), conflictingVals) - trustedExtCommit, err := types.MakeExtendedCommit(trustedBlockID, 10, 1, trustedVoteSet, conflictingPrivVals, defaultEvidenceTime) + trustedExtCommit, err := test.MakeExtendedCommitFromVoteSet(trustedBlockID, trustedVoteSet, conflictingPrivVals, defaultEvidenceTime) require.NoError(t, err) trustedCommit := trustedExtCommit.StripExtensions() trustedSignedHeader := &types.SignedHeader{ @@ -487,7 +488,7 @@ func makeLunaticEvidence( blockID := makeBlockID(conflictingHeader.Hash(), 1000, []byte("partshash")) voteSet := types.NewVoteSet(evidenceChainID, height, 1, tmproto.SignedMsgType(2), conflictingVals) - extCommit, err := types.MakeExtendedCommit(blockID, height, 1, voteSet, conflictingPrivVals, defaultEvidenceTime) + extCommit, err := test.MakeExtendedCommitFromVoteSet(blockID, voteSet, conflictingPrivVals, defaultEvidenceTime) require.NoError(t, err) commit := extCommit.StripExtensions() ev = &types.LightClientAttackEvidence{ @@ -515,7 +516,7 @@ func makeLunaticEvidence( trustedBlockID := makeBlockID(trustedHeader.Hash(), 1000, []byte("partshash")) trustedVals, privVals := types.RandValidatorSet(totalVals, defaultVotingPower) trustedVoteSet := types.NewVoteSet(evidenceChainID, height, 1, tmproto.SignedMsgType(2), trustedVals) - trustedExtCommit, err := types.MakeExtendedCommit(trustedBlockID, height, 1, trustedVoteSet, privVals, defaultEvidenceTime) + trustedExtCommit, err := test.MakeExtendedCommitFromVoteSet(trustedBlockID, trustedVoteSet, privVals, defaultEvidenceTime) require.NoError(t, err) trustedCommit := trustedExtCommit.StripExtensions() trusted = &types.LightBlock{ diff --git a/state/execution_test.go b/state/execution_test.go index ae039441a..324ad3eee 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -932,7 +932,7 @@ func makeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) types.Bloc psH = make([]byte, tmhash.Size) ) copy(h, hash) - copy(psH, partSetHash)q + copy(psH, partSetHash) return types.BlockID{ Hash: h, PartSetHeader: types.PartSetHeader{ diff --git a/store/store_test.go b/store/store_test.go index ff7a9d1ae..c1114907d 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -16,7 +16,6 @@ import ( "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" @@ -405,7 +404,7 @@ func TestLoadBlockPart(t *testing.T) { require.Contains(t, panicErr.Error(), "unmarshal to tmproto.Part failed") // 3. A good block serialized and saved to the DB should be retrievable - block := factory.MakeBlock(state, height, new(types.Commit)) + block := state.MakeBlock(height, nil, new(types.Commit), nil, state.Validators.GetProposer().Address) partSet, err := block.MakePartSet(2) require.NoError(t, err) part1 := partSet.GetPart(0) @@ -574,7 +573,7 @@ func TestLoadBlockMetaByHash(t *testing.T) { b1 := state.MakeBlock(state.LastBlockHeight+1, test.MakeNTxs(state.LastBlockHeight+1, 10), new(types.Commit), nil, state.Validators.GetProposer().Address) partSet, err := b1.MakePartSet(2) require.NoError(t, err) - seenCommit := makeTestCommit(1, tmtime.Now()) + seenCommit := makeTestExtCommit(1, tmtime.Now()) bs.SaveBlock(b1, partSet, seenCommit) baseBlock := bs.LoadBlockMetaByHash(b1.Hash())