mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-25 12:57:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change Ordering of Gossipsub Registration (#3330)

Browse Source 
* fix ordering

* Add comment
This commit is contained in:
Nishant Das 2019-08-27 20:53:22 +05:30 committed by Raul Jordan
parent 701c70ae3b
commit ca0f61bf24
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
beacon-chain/p2p/service.go
View File

@ -71,6 +71,21 @@ func (s *Service) Start() {
return return
} }
s.host = h s.host = h
// TODO(3147): Add gossip sub options
// Gossipsub registration is done before we add in any new peers
// due to libp2p's gossipsub implementation not taking into
// account previously added peers when creating the gossipsub
// object.
gs, err := pubsub.NewGossipSub(s.ctx, s.host)
if err != nil {
s.startupErr = err
log.WithError(err).Error("Failed to start pubsub")
return
}
s.pubsub = gs
if s.cfg.BootstrapNodeAddr != "" && !s.cfg.NoDiscovery { if s.cfg.BootstrapNodeAddr != "" && !s.cfg.NoDiscovery {
listener, err := startDiscoveryV5(ipAddr, privKey, s.cfg) listener, err := startDiscoveryV5(ipAddr, privKey, s.cfg)
if err != nil { if err != nil {
@ -83,6 +98,8 @@ func (s *Service) Start() {
go s.listenForNewNodes() go s.listenForNewNodes()
} }
s.started = true
if len(s.cfg.StaticPeers) > 0 { if len(s.cfg.StaticPeers) > 0 {
addrs, err := manyMultiAddrsFromString(s.cfg.StaticPeers) addrs, err := manyMultiAddrsFromString(s.cfg.StaticPeers)
if err != nil { if err != nil {
@ -91,20 +108,7 @@ func (s *Service) Start() {
s.connectWithAllPeers(addrs) s.connectWithAllPeers(addrs)
} }
// TODO(3147): Add gossip sub options
gs, err := pubsub.NewGossipSub(s.ctx, s.host)
if err != nil {
s.startupErr = err
log.WithError(err).Error("Failed to start pubsub")
return
}
s.pubsub = gs
s.started = true
registerMetrics(s) registerMetrics(s)
multiAddrs := s.host.Network().ListenAddresses() multiAddrs := s.host.Network().ListenAddresses()
logIP4Addr(s.host.ID(), multiAddrs...) logIP4Addr(s.host.ID(), multiAddrs...)
} }