fix: return no peers available

igor-sirotin · igor-sirotin · commit 0c4ee98c7da1 · 2025-11-27T10:27:30.000Z
diff --git a/waku/v2/peermanager/peer_selection.go b/waku/v2/peermanager/peer_selection.go
@@ -73,7 +73,10 @@ func (pm *PeerManager) SelectRandom(criteria PeerSelectionCriteria) (peer.IDSlic
 	if err != nil {
 		return nil, err
 	}
-	if len(criteria.PubsubTopics) > 0 && len(filteredPeers) > 0 {
+	if len(filteredPeers) == 0 {
+		return nil, utils.ErrNoPeersAvailable
+	}
+	if len(criteria.PubsubTopics) > 0 {
 		filteredPeers = pm.host.Peerstore().(wps.WakuPeerstore).PeersByPubSubTopics(criteria.PubsubTopics, filteredPeers...)
 	}
 	//Not passing excludePeers as filterPeers are already considering excluded ones.

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,10 @@ func (pm *PeerManager) SelectRandom(criteria PeerSelectionCriteria) (peer.IDSlic`
`73`	`73`	`if err != nil {`
`74`	`74`	`return nil, err`
`75`	`75`	`}`
`76`		`- if len(criteria.PubsubTopics) > 0 && len(filteredPeers) > 0 {`
	`76`	`+ if len(filteredPeers) == 0 {`
	`77`	`+ return nil, utils.ErrNoPeersAvailable`
	`78`	`+ }`
	`79`	`+ if len(criteria.PubsubTopics) > 0 {`
`77`	`80`	`filteredPeers = pm.host.Peerstore().(wps.WakuPeerstore).PeersByPubSubTopics(criteria.PubsubTopics, filteredPeers...)`
`78`	`81`	`}`
`79`	`82`	`//Not passing excludePeers as filterPeers are already considering excluded ones.`