mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-06 21:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

pex: regularize reactor constructor (#7532)

Browse Source
This commit is contained in:
Sam Kleinman
2022-01-07 13:52:11 -05:00
committed by GitHub
parent aa76a367e0
commit 90cf742065
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
node/node.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/tendermint/tendermint/internal/eventbus"
"github.com/tendermint/tendermint/internal/mempool"
"github.com/tendermint/tendermint/internal/p2p"
"github.com/tendermint/tendermint/internal/p2p/pex"
"github.com/tendermint/tendermint/internal/proxy"
tmpubsub "github.com/tendermint/tendermint/internal/pubsub"
rpccore "github.com/tendermint/tendermint/internal/rpc/core"
@@ -378,7 +379,7 @@ func makeNode(
var pexReactor service.Service
if cfg.P2P.PexReactor {
pexReactor, err = createPEXReactor(ctx, logger, peerManager, router)
pexReactor, err = pex.NewReactor(ctx, logger, peerManager, router.OpenChannel, peerManager.Subscribe(ctx))
if err != nil {
return nil, combineCloseError(err, makeCloser(closers))
}
@@ -487,7 +488,7 @@ func makeSeedNode(
closer)
}
pexReactor, err := createPEXReactor(ctx, logger, peerManager, router)
pexReactor, err := pex.NewReactor(ctx, logger, peerManager, router.OpenChannel, peerManager.Subscribe(ctx))
if err != nil {
return nil, combineCloseError(err, closer)
}

15
node/setup.go
View File

@@ -408,21 +408,6 @@ func createRouter(
)
}
func createPEXReactor(
ctx context.Context,
logger log.Logger,
peerManager *p2p.PeerManager,
router *p2p.Router,
) (service.Service, error) {
channel, err := router.OpenChannel(ctx, pex.ChannelDescriptor())
if err != nil {
return nil, err
}
return pex.NewReactor(logger, peerManager, channel, peerManager.Subscribe(ctx)), nil
}
func makeNodeInfo(
cfg *config.Config,
nodeKey types.NodeKey,