Merge branch 'master' into wb/abci-prepare-proposal-synchronize

This commit is contained in:
William Banfield
2022-03-10 10:47:29 -05:00
committed by GitHub
7 changed files with 30 additions and 7 deletions

View File

@@ -357,7 +357,7 @@ func makeNode(
return nil, combineCloseError(err, makeCloser(closers))
}
var pexReactor service.Service
var pexReactor service.Service = service.NopService{}
if cfg.P2P.PexReactor {
pexReactor, err = pex.NewReactor(ctx, logger, peerManager, router.OpenChannel, peerManager.Subscribe(ctx))
if err != nil {