node: pass eventbus at construction time (#8084)

* node: pass eventbus at construction time

* remove cruft

node/node.go

@@ -289,6 +289,7 @@ func makeNode(
 		mp,
 		evPool,
 		blockStore,
+		eventBus,
 		sm.BlockExecutorWithMetrics(nodeMetrics.state),
 	)
 

node/node_test.go

@@ -323,6 +323,8 @@ func TestCreateProposalBlock(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
+	eventBus := eventbus.NewDefault(logger)
+	require.NoError(t, eventBus.Start(ctx))
 	blockExec := sm.NewBlockExecutor(
 		stateStore,
 		logger,
@@ -330,6 +332,7 @@ func TestCreateProposalBlock(t *testing.T) {
 		mp,
 		evidencePool,
 		blockStore,
+		eventBus,
 	)
 
 	commit := types.NewCommit(height-1, 0, types.BlockID{}, nil)
@@ -398,6 +401,9 @@ func TestMaxTxsProposalBlockSize(t *testing.T) {
 	err = mp.CheckTx(ctx, tx, nil, mempool.TxInfo{})
 	assert.NoError(t, err)
 
+	eventBus := eventbus.NewDefault(logger)
+	require.NoError(t, eventBus.Start(ctx))
+
 	blockExec := sm.NewBlockExecutor(
 		stateStore,
 		logger,
@@ -405,6 +411,7 @@ func TestMaxTxsProposalBlockSize(t *testing.T) {
 		mp,
 		sm.EmptyEvidencePool{},
 		blockStore,
+		eventBus,
 	)
 
 	commit := types.NewCommit(height-1, 0, types.BlockID{}, nil)
@@ -469,6 +476,9 @@ func TestMaxProposalBlockSize(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
+	eventBus := eventbus.NewDefault(logger)
+	require.NoError(t, eventBus.Start(ctx))
+
 	blockExec := sm.NewBlockExecutor(
 		stateStore,
 		logger,
@@ -476,6 +486,7 @@ func TestMaxProposalBlockSize(t *testing.T) {
 		mp,
 		sm.EmptyEvidencePool{},
 		blockStore,
+		eventBus,
 	)
 
 	blockID := types.BlockID{

node/setup.go

@@ -270,6 +270,7 @@ func createConsensusReactor(
 		blockStore,
 		mp,
 		evidencePool,
+		eventBus,
 		consensus.StateMetrics(csMetrics),
 	)
 	if err != nil {
@@ -286,6 +287,7 @@ func createConsensusReactor(
 		consensusState,
 		router.OpenChannel,
 		peerManager.Subscribe(ctx),
+		eventBus,
 		waitSync,
 		csMetrics,
 	)
@@ -293,9 +295,6 @@ func createConsensusReactor(
 		return nil, nil, err
 	}
 
-	// Services which will be publishing and/or subscribing for messages (events)
-	// consensusReactor will set it on consensusState and blockExecutor.
-	reactor.SetEventBus(eventBus)
 	return reactor, consensusState, nil
 }