refactor: use a more efficient querying method (#921)

Signed-off-by: pullmerge <[email protected]>
Co-authored-by: Andrew Gillis <[email protected]>

Author: pullmerge

bitswap/server/internal/decision/engine.go

@@ -156,6 +156,9 @@ type PeerLedger interface {
 
 	// PeerDisconnected informs the ledger that [peer.ID] is no longer connected.
 	PeerDisconnected(p peer.ID)
+
+	// HasPeer checks if the ledger has an active session with the given peer.
+	HasPeer(p peer.ID) bool
 }
 
 // Engine manages sending requested blocks to peers.
@@ -671,6 +674,12 @@ func (e *Engine) Peers() []peer.ID {
 	return e.peerLedger.CollectPeerIDs()
 }
 
+func (e *Engine) HasPeer(p peer.ID) bool {
+	e.lock.RLock()
+	defer e.lock.RUnlock()
+	return e.peerLedger.HasPeer(p)
+}
+
 // MessageReceived is called when a message is received from a remote peer.
 // For each item in the wantlist, add a want-have or want-block entry to the
 // request queue (this is later popped off by the workerTasks). Returns true

bitswap/server/internal/decision/engine_test.go

@@ -172,12 +172,7 @@ func TestPeerIsAddedToPeersWhenMessageSent(t *testing.T) {
 }
 
 func peerIsPartner(p peer.ID, e *Engine) bool {
-	for _, partner := range e.Peers() {
-		if partner == p {
-			return true
-		}
-	}
-	return false
+	return e.HasPeer(p)
 }
 
 func newEngineForTesting(

bitswap/server/internal/decision/peer_ledger.go

@@ -164,3 +164,8 @@ func (l *DefaultPeerLedger) PeerDisconnected(p peer.ID) {
 	l.ClearPeerWantlist(p)
 	delete(l.peers, p)
 }
+
+func (l *DefaultPeerLedger) HasPeer(p peer.ID) bool {
+	_, ok := l.peers[p]
+	return ok
+}

bitswap/testnet/peernet.go

@@ -2,6 +2,7 @@ package bitswap
 
 import (
 	"context"
+	"slices"
 
 	iface "github.com/ipfs/boxo/bitswap/network"
 	bsnet "github.com/ipfs/boxo/bitswap/network/bsnet"
@@ -29,12 +30,7 @@ func (pn *peernet) Adapter(p tnet.Identity, opts ...bsnet.NetOpt) iface.BitSwapN
 }
 
 func (pn *peernet) HasPeer(p peer.ID) bool {
-	for _, member := range pn.Mocknet.Peers() {
-		if p == member {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(pn.Mocknet.Peers(), p)
 }
 
 var _ Network = (*peernet)(nil)

gateway/handler_codec.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"slices"
 	"strings"
 	"time"
 
@@ -136,10 +137,8 @@ func (i *handler) renderCodec(ctx context.Context, w http.ResponseWriter, r *htt
 	// return raw block as-is, without conversion
 	skipCodecs, ok := contentTypeToRaw[rq.responseFormat]
 	if ok {
-		for _, skipCodec := range skipCodecs {
-			if skipCodec == cidCodec {
-				return i.serveCodecRaw(ctx, w, r, blockSize, blockData, rq.contentPath, modtime, rq.begin)
-			}
+		if slices.Contains(skipCodecs, cidCodec) {
+			return i.serveCodecRaw(ctx, w, r, blockSize, blockData, rq.contentPath, modtime, rq.begin)
 		}
 	}