Skip to content

Commit 6bf4e3d

Browse files
committed
build the block store inside makeReactor again, as on main
1 parent 959935e commit 6bf4e3d

2 files changed

Lines changed: 12 additions & 21 deletions

File tree

‎sei-tendermint/internal/blocksync/reactor_test.go‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,24 @@ func setup(
7878
return rts
7979
}
8080

81-
// newMemBlockStore returns a block store backed by a fresh in-memory database.
82-
func newMemBlockStore() *store.BlockStore {
83-
return store.NewBlockStore(dbm.NewMemDB())
84-
}
85-
86-
// makeReactor returns a reactor serving genDoc on router, backed by blockStore, and the
87-
// event bus of its block executor.
81+
// makeReactor returns a reactor serving genDoc on router, and the event bus of its block
82+
// executor.
8883
func makeReactor(
8984
ctx context.Context,
9085
t *testing.T,
9186
genDoc *types.GenesisDoc,
9287
router *p2p.Router,
93-
blockStore *store.BlockStore,
9488
blockSync bool,
9589
restartEvent func(),
9690
selfRemediationConfig *config.SelfRemediationConfig,
9791
) (*Reactor, *eventbus.EventBus) {
9892

9993
app := abci.BaseApplication{}
10094

95+
blockDB := dbm.NewMemDB()
10196
stateDB := dbm.NewMemDB()
10297
stateStore := sm.NewStore(stateDB)
98+
blockStore := store.NewBlockStore(blockDB)
10399
proxyApp := proxy.New(app)
104100

105101
state, err := sm.MakeGenesisState(genDoc)
@@ -158,7 +154,6 @@ func (rts *reactorTestSuite) addNode(
158154
t,
159155
genDoc,
160156
rts.network.Node(nodeID).Router,
161-
newMemBlockStore(),
162157
true,
163158
func() {},
164159
remediationConfig,
@@ -500,7 +495,6 @@ func TestQueryResponder_ServesBlockRequestsWhenBlockSyncDisabled(t *testing.T) {
500495
t,
501496
genDoc,
502497
network.Node(nodeIDs[0]).Router,
503-
newMemBlockStore(),
504498
false,
505499
func() {},
506500
config.DefaultSelfRemediationConfig(),
@@ -566,13 +560,11 @@ func TestQueryResponder_ServesStatusRequestsWhenBlockSyncDisabled(t *testing.T)
566560
network := p2p.MakeTestNetwork(t, p2p.TestNetworkOptions{NumNodes: 2})
567561
nodeIDs := network.NodeIDs()
568562

569-
blockStore := newMemBlockStore()
570563
server, _ := makeReactor(
571564
ctx,
572565
t,
573566
genDoc,
574567
network.Node(nodeIDs[0]).Router,
575-
blockStore,
576568
false,
577569
func() {},
578570
config.DefaultSelfRemediationConfig(),
@@ -589,7 +581,7 @@ func TestQueryResponder_ServesStatusRequestsWhenBlockSyncDisabled(t *testing.T)
589581

590582
statusResponse, ok := msg.Message.Sum.(*pb.Message_StatusResponse)
591583
require.True(t, ok)
592-
require.Equal(t, blockStore.Base(), statusResponse.StatusResponse.GetBase())
593-
require.Equal(t, blockStore.Height(), statusResponse.StatusResponse.GetHeight())
584+
require.Equal(t, server.store.Base(), statusResponse.StatusResponse.GetBase())
585+
require.Equal(t, server.store.Height(), statusResponse.StatusResponse.GetHeight())
594586
require.Equal(t, nodeIDs[0], msg.From)
595587
}

‎sei-tendermint/internal/blocksync/reactor_validation_failure_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,16 @@ func TestReactor_RejectsInvalidCommitFromPeer(t *testing.T) {
213213
invalidCommitID, syncID := nodeIDs[0], nodeIDs[1]
214214
syncNode := network.Node(syncID)
215215

216-
invalidCommitStore, correctStore := newMemBlockStore(), newMemBlockStore()
217-
invalidCommitReactor, _ := makeReactor(ctx, t, genDoc, network.Node(invalidCommitID).Router, invalidCommitStore, false, func() {}, config.DefaultSelfRemediationConfig())
218-
syncReactor, syncBus := makeReactor(ctx, t, genDoc, syncNode.Router, newMemBlockStore(), true, func() {}, config.DefaultSelfRemediationConfig())
216+
invalidCommitReactor, _ := makeReactor(ctx, t, genDoc, network.Node(invalidCommitID).Router, false, func() {}, config.DefaultSelfRemediationConfig())
217+
syncReactor, syncBus := makeReactor(ctx, t, genDoc, syncNode.Router, true, func() {}, config.DefaultSelfRemediationConfig())
219218

220219
// Connect the invalid-commit node and the syncing node.
221220
network.Start(t)
222221
invalidCommitConn := syncNode.WaitForConnAndGet(ctx, invalidCommitID)
223222

224223
// The correct node is not connected to anyone yet.
225224
correctNode := network.MakeNode(t, p2p.TestNodeOptions{})
226-
correctReactor, _ := makeReactor(ctx, t, genDoc, correctNode.Router, correctStore, false, func() {}, config.DefaultSelfRemediationConfig())
225+
correctReactor, _ := makeReactor(ctx, t, genDoc, correctNode.Router, false, func() {}, config.DefaultSelfRemediationConfig())
227226

228227
// The correct node applies and stores correct blocks 1 to 4.
229228
correctExec := correctReactor.syncer.OrPanic("syncer should be configured in tests").blockExec
@@ -235,7 +234,7 @@ func TestReactor_RejectsInvalidCommitFromPeer(t *testing.T) {
235234
b := makeCommittedBlock(ctx, t, state, privVals, height, lastCommit)
236235
state, err = correctExec.ApplyBlock(ctx, state, b.id, b.block, nil)
237236
require.NoError(t, err)
238-
correctStore.SaveBlock(b.block, b.parts, b.commit)
237+
correctReactor.store.SaveBlock(b.block, b.parts, b.commit)
239238
correct = append(correct, b)
240239
lastCommit = b.commit
241240
}
@@ -244,12 +243,12 @@ func TestReactor_RejectsInvalidCommitFromPeer(t *testing.T) {
244243
// whose commit for block 3 is invalid.
245244
require.NoError(t, invalidCommitReactor.stateStore.Save(state))
246245
for _, b := range correct[:3] {
247-
invalidCommitStore.SaveBlock(b.block, b.parts, b.commit)
246+
invalidCommitReactor.store.SaveBlock(b.block, b.parts, b.commit)
248247
}
249248
invalidCommitBlock4 := withInvalidLastSignature(t, correct[3].block, tc.flag)
250249
invalidCommitParts4, err := invalidCommitBlock4.MakePartSet(types.BlockPartSizeBytes)
251250
require.NoError(t, err)
252-
invalidCommitStore.SaveBlock(invalidCommitBlock4, invalidCommitParts4, correct[3].commit)
251+
invalidCommitReactor.store.SaveBlock(invalidCommitBlock4, invalidCommitParts4, correct[3].commit)
253252

254253
// The block executor of the syncing node publishes a new block event after it
255254
// applies each saved block. The subscription has room for blocks 1 to 3.

0 commit comments

Comments
 (0)