Merge branch 'master' into wb/issue-5908

This commit is contained in:
William Banfield
2021-08-20 13:17:46 -04:00
committed by GitHub
19 changed files with 449 additions and 206 deletions

View File

@@ -445,9 +445,13 @@ func makeNode(config *cfg.Config,
BlockStore: blockStore,
EvidencePool: evPool,
ConsensusState: csState,
P2PPeers: sw,
WaitSyncChecker: csReactor,
BlockSyncReactor: bcReactor.(cs.BlockSyncReactor),
P2PPeers: sw,
PeerManager: peerManager,
GenDoc: genDoc,
EventSinks: eventSinks,
@@ -455,6 +459,17 @@ func makeNode(config *cfg.Config,
Mempool: mp,
Logger: logger.With("module", "rpc"),
Config: *config.RPC,
P2PPeers: sw,
PeerManager: peerManager,
GenDoc: genDoc,
EventSinks: eventSinks,
ConsensusReactor: csReactor,
EventBus: eventBus,
Mempool: mp,
Logger: logger.With("module", "rpc"),
Config: *config.RPC,
},
}