From 346bfc82e828fa9a384e246a3390e41b2cd105be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Wed, 7 Sep 2022 10:00:40 +0200 Subject: [PATCH] feat: re-enable p2p layer (#152) --- eth/backend.go | 6 +++--- node/node.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index f906beceba..1a53f8710c 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -539,7 +539,7 @@ func (s *Ethereum) Start() error { s.startBloomHandlers(params.BloomBitsBlocks) // Figure out a max peers count based on the server limits - //maxPeers := s.p2pServer.MaxPeers + maxPeers := s.p2pServer.MaxPeers //if s.config.LightServ > 0 { // if s.config.LightPeers >= s.p2pServer.MaxPeers { // return fmt.Errorf("invalid peer config: light peer count (%d) >= total peer count (%d)", s.config.LightPeers, s.p2pServer.MaxPeers) @@ -547,7 +547,7 @@ func (s *Ethereum) Start() error { // maxPeers -= s.config.LightPeers //} // Start the networking layer and the light server if requested - //s.handler.Start(maxPeers) + s.handler.Start(maxPeers) return nil } @@ -557,7 +557,7 @@ func (s *Ethereum) Stop() error { // Stop all the peer-related stuff first. s.ethDialCandidates.Close() s.snapDialCandidates.Close() - //s.handler.Stop() + s.handler.Stop() // Then stop everything else. s.bloomIndexer.Close() diff --git a/node/node.go b/node/node.go index 7363480ee8..ac8c27dde5 100644 --- a/node/node.go +++ b/node/node.go @@ -262,15 +262,15 @@ func (n *Node) doClose(errs []error) error { // openEndpoints starts all network and RPC endpoints. func (n *Node) openEndpoints() error { // start networking endpoints - /*n.log.Info("Starting peer-to-peer node", "instance", n.server.Name) + n.log.Info("Starting peer-to-peer node", "instance", n.server.Name) if err := n.server.Start(); err != nil { return convertFileLockError(err) - }*/ + } // start RPC endpoints err := n.startRPC() if err != nil { n.stopRPC() - //n.server.Stop() + n.server.Stop() } return err } @@ -299,7 +299,7 @@ func (n *Node) stopServices(running []Lifecycle) error { } // Stop p2p networking. - //n.server.Stop() + n.server.Stop() if len(failure.Services) > 0 { return failure