This commit is contained in:
Sergio Mena
2022-11-15 03:31:50 +01:00
parent 288ba2e76a
commit 173cfe8cb5
3 changed files with 11 additions and 13 deletions

View File

@@ -148,7 +148,7 @@ func newReactor(
panic(fmt.Errorf("error apply block: %w", err))
}
blockStore.SaveBlock(thisBlock, thisParts, seenExtCommit)
blockStore.SaveBlockWithExtendedCommit(thisBlock, thisParts, seenExtCommit)
}
bcReactor := NewReactor(state.Copy(), blockExec, blockStore, fastSync, NopMetrics())

View File

@@ -370,10 +370,11 @@ func TestSaveBlockWithExtendedCommitPanicOnAbsentExtension(t *testing.T) {
},
} {
t.Run(testCase.name, func(t *testing.T) {
state, bs, cleanup, err := makeStateAndBlockStore(t.TempDir())
require.NoError(t, err)
state, bs, cleanup := makeStateAndBlockStore(log.NewTMLogger(new(bytes.Buffer)))
defer cleanup()
block := factory.MakeBlock(state, bs.Height()+1, new(types.Commit))
h := bs.Height() + 1
block := state.MakeBlock(h, test.MakeNTxs(h, 10), new(types.Commit), nil, state.Validators.GetProposer().Address)
seenCommit := makeTestExtCommit(block.Header.Height, tmtime.Now())
ps, err := block.MakePartSet(2)
require.NoError(t, err)
@@ -410,10 +411,10 @@ func TestLoadBlockExtendedCommit(t *testing.T) {
},
} {
t.Run(testCase.name, func(t *testing.T) {
state, bs, cleanup, err := makeStateAndBlockStore(t.TempDir())
require.NoError(t, err)
state, bs, cleanup := makeStateAndBlockStore(log.NewTMLogger(new(bytes.Buffer)))
defer cleanup()
block := factory.MakeBlock(state, bs.Height()+1, new(types.Commit))
h := bs.Height() + 1
block := state.MakeBlock(h, test.MakeNTxs(h, 10), new(types.Commit), nil, state.Validators.GetProposer().Address)
seenCommit := makeTestExtCommit(block.Header.Height, tmtime.Now())
ps, err := block.MakePartSet(2)
require.NoError(t, err)
@@ -658,7 +659,7 @@ func TestLoadBlockMetaByHash(t *testing.T) {
partSet, err := b1.MakePartSet(2)
require.NoError(t, err)
seenCommit := makeTestExtCommit(1, tmtime.Now())
bs.SaveBlock(b1, partSet, seenCommit)
bs.SaveBlock(b1, partSet, seenCommit.ToCommit())
baseBlock := bs.LoadBlockMetaByHash(b1.Hash())
assert.EqualValues(t, b1.Header.Height, baseBlock.Header.Height)

View File

@@ -1,7 +1,6 @@
package types
import (
"context"
"testing"
"time"
@@ -426,8 +425,6 @@ func TestInvalidPrecommitExtensions(t *testing.T) {
}
func TestEnsureVoteExtension(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
privVal := NewMockPV()
testCases := []struct {
@@ -444,8 +441,8 @@ func TestEnsureVoteExtension(t *testing.T) {
}, false},
}
for _, tc := range testCases {
precommit := examplePrecommit(t)
signVote(ctx, t, privVal, "test_chain_id", precommit)
precommit := examplePrecommit()
signVote(t, privVal, "test_chain_id", precommit)
tc.malleateVote(precommit)
if tc.expectError {
require.Error(t, precommit.EnsureExtension(), "EnsureExtension for %s", tc.name)