forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: re-enable p2p layer (#152)

Browse source
This commit is contained in:
Péter Garamvölgyi 2022-09-07 10:00:40 +02:00 committed by GitHub
parent ff9405b2fa
commit 346bfc82e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eth/backend.go
View file

@ -539,7 +539,7 @@ func (s *Ethereum) Start() error {
s.startBloomHandlers(params.BloomBitsBlocks) s.startBloomHandlers(params.BloomBitsBlocks)
// Figure out a max peers count based on the server limits // 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.LightServ > 0 {
// if s.config.LightPeers >= s.p2pServer.MaxPeers { // 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) // 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 // maxPeers -= s.config.LightPeers
//} //}
// Start the networking layer and the light server if requested // Start the networking layer and the light server if requested
//s.handler.Start(maxPeers) s.handler.Start(maxPeers)
return nil return nil
} }
@ -557,7 +557,7 @@ func (s *Ethereum) Stop() error {
// Stop all the peer-related stuff first. // Stop all the peer-related stuff first.
s.ethDialCandidates.Close() s.ethDialCandidates.Close()
s.snapDialCandidates.Close() s.snapDialCandidates.Close()
//s.handler.Stop() s.handler.Stop()
// Then stop everything else. // Then stop everything else.
s.bloomIndexer.Close() s.bloomIndexer.Close()

8
node/node.go
View file

@ -262,15 +262,15 @@ func (n *Node) doClose(errs []error) error {
// openEndpoints starts all network and RPC endpoints. // openEndpoints starts all network and RPC endpoints.
func (n *Node) openEndpoints() error { func (n *Node) openEndpoints() error {
// start networking endpoints // 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 { if err := n.server.Start(); err != nil {
return convertFileLockError(err) return convertFileLockError(err)
}*/ }
// start RPC endpoints // start RPC endpoints
err := n.startRPC() err := n.startRPC()
if err != nil { if err != nil {
n.stopRPC() n.stopRPC()
//n.server.Stop() n.server.Stop()
} }
return err return err
} }
@ -299,7 +299,7 @@ func (n *Node) stopServices(running []Lifecycle) error {
} }
// Stop p2p networking. // Stop p2p networking.
//n.server.Stop() n.server.Stop()
if len(failure.Services) > 0 { if len(failure.Services) > 0 {
return failure return failure