Fix leak due to cid queue never getting cleaned up

This removes entries from the queue portion of CidQueue that were removed from the map portion.

Author: gammazero

bitswap/client/internal/blockpresencemanager/blockpresencemanager.go

@@ -111,6 +111,10 @@ func (bpm *BlockPresenceManager) allDontHave(peers []peer.ID, c cid.Cid) bool {
 
 // RemoveKeys cleans up the given keys from the block presence map
 func (bpm *BlockPresenceManager) RemoveKeys(ks []cid.Cid) {
+	if len(ks) == 0 {
+		return
+	}
+
 	bpm.Lock()
 	defer bpm.Unlock()
 

bitswap/client/internal/session/cidqueue.go

@@ -31,14 +31,7 @@ func (cq *cidQueue) Pop() cid.Cid {
 
 func (cq *cidQueue) Cids() []cid.Cid {
 	// Lazily delete from the list any cids that were removed from the set
-	if cq.elems.Len() > cq.eset.Len() {
-		for i := 0; i < cq.elems.Len(); i++ {
-			c := cq.elems.PopFront()
-			if cq.eset.Has(c) {
-				cq.elems.PushBack(c)
-			}
-		}
-	}
+	cq.GC()
 
 	if cq.elems.Len() == 0 {
 		return nil
@@ -69,3 +62,14 @@ func (cq *cidQueue) Has(c cid.Cid) bool {
 func (cq *cidQueue) Len() int {
 	return cq.eset.Len()
 }
+
+func (cq *cidQueue) GC() {
+	if cq.elems.Len() > cq.eset.Len() {
+		for i := 0; i < cq.elems.Len(); i++ {
+			c := cq.elems.PopFront()
+			if cq.eset.Has(c) {
+				cq.elems.PushBack(c)
+			}
+		}
+	}
+}

bitswap/client/internal/session/sessionwants.go

@@ -82,6 +82,7 @@ func (sw *sessionWants) WantsSent(ks []cid.Cid) {
 			sw.liveWants[c] = now
 		}
 	}
+	sw.toFetch.GC()
 }
 
 // BlocksReceived removes received block CIDs from the live wants list and
@@ -111,6 +112,7 @@ func (sw *sessionWants) BlocksReceived(ks []cid.Cid) ([]cid.Cid, time.Duration)
 			sw.toFetch.Remove(c)
 		}
 	}
+	sw.toFetch.GC()
 
 	// If the live wants ordering array is a long way out of sync with the
 	// live wants map, clean up the ordering array
@@ -155,6 +157,7 @@ func (sw *sessionWants) CancelPending(keys []cid.Cid) {
 		sw.toFetch.Remove(k)
 		delete(sw.liveWants, k)
 	}
+	sw.toFetch.GC()
 }
 
 // LiveWants returns a list of live wants