mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-10 22:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "consensus: p2p refactor (#5969)"

Browse Source 
This reverts commit 16bbe8c862.
This commit is contained in:
Aleksandr Bezobchuk
2021-03-16 13:48:17 -04:00
parent efd2fde474
commit 2b60852e23
18 changed files with 3026 additions and 3791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
node/node.go
View File

@@ -516,27 +516,27 @@ func createConsensusReactor(
reactorShim := p2p.NewReactorShim(logger, "ConsensusShim", cs.ChannelShims)
var (
channels map[p2p.ChannelID]*p2p.Channel
peerUpdates *p2p.PeerUpdates
)
// var (
// channels map[p2p.ChannelID]*p2p.Channel
// peerUpdates *p2p.PeerUpdates
// )
if useLegacyP2P {
channels = getChannelsFromShim(reactorShim)
peerUpdates = reactorShim.PeerUpdates
} else {
channels = makeChannelsFromShims(router, cs.ChannelShims)
peerUpdates = peerManager.Subscribe()
}
// if useLegacyP2P {
// channels = getChannelsFromShim(reactorShim)
// peerUpdates = reactorShim.PeerUpdates
// } else {
// channels = makeChannelsFromShims(router, cs.ChannelShims)
// peerUpdates = peerManager.Subscribe()
// }
reactor := cs.NewReactor(
logger,
// logger,
consensusState,
channels[cs.StateChannel],
channels[cs.DataChannel],
channels[cs.VoteChannel],
channels[cs.VoteSetBitsChannel],
peerUpdates,
// channels[cs.StateChannel],
// channels[cs.DataChannel],
// channels[cs.VoteChannel],
// channels[cs.VoteSetBitsChannel],
// peerUpdates,
waitSync,
cs.ReactorMetrics(csMetrics),
)