fix: add chainsync client close and close p2p channels in a single go routine

Author: blockchainluffy

rolling-shutter/medley/chainsync/client.go

@@ -146,7 +146,13 @@ func (s *Client) ChainID(ctx context.Context) (*big.Int, error) {
 	return s.chainID, nil
 }
 
-func (s *Client) Start(_ context.Context, runner service.Runner) error {
+func (s *Client) Start(ctx context.Context, runner service.Runner) error {
+	runner.Go(func() error {
+		<-ctx.Done()
+		s.Client.Close()
+		s.log.Debug("chainsync client closed")
+		return nil
+	})
 	return runner.StartService(s.getServices()...)
 }
 

rolling-shutter/p2p/bootstrap.go

@@ -100,6 +100,7 @@ func bootstrap(
 		_, err := retry.FunctionCall(
 			ctx,
 			f,
+			retry.NumberOfRetries(10),
 			retry.StopOnErrors(errInsufficientBootstrpConfigured),
 			retry.Interval(2*time.Second))
 		if err != nil {

rolling-shutter/p2p/p2p.go

@@ -103,10 +103,6 @@ func (p *P2PNode) Run(
 	p.mux.Lock()
 	defer p.mux.Unlock()
 
-	runner.Defer(func() {
-		close(p.GossipMessages)
-	})
-
 	if err := p.init(ctx); err != nil {
 		return err
 	}
@@ -120,6 +116,7 @@ func (p *P2PNode) Run(
 		if err := p.dht.Close(); err != nil {
 			log.Error().Err(err).Msg("error closing dht")
 		}
+		close(p.GossipMessages)
 		log.Debug().Msg("host closed")
 		return nil
 	})