Clean peer info at subscriber exported API

ipni · Feb 14, 2024 · 5eedcbc · 5eedcbc
1 parent 820dced
commit 5eedcbc
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/dagsync/subscriber.go b/dagsync/subscriber.go
@@ -415,6 +415,7 @@ func (s *Subscriber) SyncAdChain(ctx context.Context, peerInfo peer.AddrInfo, op
 		opts.blockHook = s.generalBlockHook
 	}
 
+	peerInfo = cleanPeerAddrInfo(peerInfo)
 	var err error
 	peerInfo, err = removeIDFromAddrs(peerInfo)
 	if err != nil {
@@ -563,6 +564,7 @@ func (s *Subscriber) syncEntries(ctx context.Context, peerInfo peer.AddrInfo, en
 	s.expSyncMutex.Unlock()
 	defer s.expSyncWG.Done()
 
+	peerInfo = cleanPeerAddrInfo(peerInfo)
 	peerInfo, err := removeIDFromAddrs(peerInfo)
 	if err != nil {
 		return err
@@ -1089,3 +1091,14 @@ SegSyncLoop:
 	log.Debugw("Segmented sync completed", "syncedCount", syncedCount)
 	return syncedCount, nil
 }
+
+func cleanPeerAddrInfo(target peer.AddrInfo) peer.AddrInfo {
+	var cleaned peer.AddrInfo
+	cleaned.Addrs = make([]multiaddr.Multiaddr, 0, len(target.Addrs))
+	for _, addr := range target.Addrs {
+		if addr != nil {
+			cleaned.Addrs = append(cleaned.Addrs, addr)
+		}
+	}
+	return cleaned
+}