mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-04-19 15:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

p2p: cleanup unused arguments (#7079)

Browse Source 
This is mostly just reading through the output of uparam, after
noticing that there were a few places where we were ignoring some arguments.
This commit is contained in:
Sam Kleinman
2021-10-08 08:49:17 -04:00
committed by GitHub
parent 4ca130d226
commit 1b5bb5348f
7 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
node/node.go
View File

@@ -235,7 +235,7 @@ func makeNode(cfg *config.Config,
p2pLogger := logger.With("module", "p2p")
transport := createTransport(p2pLogger, cfg)
peerManager, err := createPeerManager(cfg, dbProvider, p2pLogger, nodeKey.ID)
peerManager, err := createPeerManager(cfg, dbProvider, nodeKey.ID)
if err != nil {
return nil, fmt.Errorf("failed to create peer manager: %w", err)
}
@@ -283,7 +283,7 @@ func makeNode(cfg *config.Config,
// Create the blockchain reactor. Note, we do not start block sync if we're
// doing a state sync first.
bcReactorShim, bcReactor, err := createBlockchainReactor(
logger, cfg, state, blockExec, blockStore, csReactor,
logger, state, blockExec, blockStore, csReactor,
peerManager, router, blockSync && !stateSync, nodeMetrics.consensus,
)
if err != nil {
@@ -352,7 +352,7 @@ func makeNode(cfg *config.Config,
pexCh := pex.ChannelDescriptor()
transport.AddChannelDescriptors([]*p2p.ChannelDescriptor{&pexCh})
pexReactor, err = createPEXReactorV2(cfg, logger, peerManager, router)
pexReactor, err = createPEXReactorV2(logger, peerManager, router)
if err != nil {
return nil, err
}
@@ -446,7 +446,7 @@ func makeSeedNode(cfg *config.Config,
p2pLogger := logger.With("module", "p2p")
transport := createTransport(p2pLogger, cfg)
peerManager, err := createPeerManager(cfg, dbProvider, p2pLogger, nodeKey.ID)
peerManager, err := createPeerManager(cfg, dbProvider, nodeKey.ID)
if err != nil {
return nil, fmt.Errorf("failed to create peer manager: %w", err)
}
@@ -466,7 +466,7 @@ func makeSeedNode(cfg *config.Config,
pexCh := pex.ChannelDescriptor()
transport.AddChannelDescriptors([]*p2p.ChannelDescriptor{&pexCh})
pexReactor, err = createPEXReactorV2(cfg, logger, peerManager, router)
pexReactor, err = createPEXReactorV2(logger, peerManager, router)
if err != nil {
return nil, err
}

3
node/setup.go
View File

@@ -254,7 +254,6 @@ func createEvidenceReactor(
func createBlockchainReactor(
logger log.Logger,
cfg *config.Config,
state sm.State,
blockExec *sm.BlockExecutor,
blockStore *store.BlockStore,
@@ -354,7 +353,6 @@ func createTransport(logger log.Logger, cfg *config.Config) *p2p.MConnTransport
func createPeerManager(
cfg *config.Config,
dbProvider config.DBProvider,
p2pLogger log.Logger,
nodeID types.NodeID,
) (*p2p.PeerManager, error) {
@@ -443,7 +441,6 @@ func createRouter(
}
func createPEXReactorV2(
cfg *config.Config,
logger log.Logger,
peerManager *p2p.PeerManager,
router *p2p.Router,