Use NextExpiry instead of Peek

libp2p · Sep 14, 2024 · a1cc34a · a1cc34a
1 parent 8edbb39
commit a1cc34a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/p2p/host/peerstore/pstoremem/addr_book.go b/p2p/host/peerstore/pstoremem/addr_book.go
@@ -110,12 +110,15 @@ func (pa *peerAddrs) FindAddr(p peer.ID, addrBytes ma.Multiaddr) (*expiringAddr,
 	return nil, false
 }
 
-func (pa *peerAddrs) Peek() *expiringAddr {
-	return pa.expiringHeap[len(pa.expiringHeap)-1]
+func (pa *peerAddrs) NextExpiry() time.Time {
+	if len(pa.expiringHeap) == 0 {
+		return time.Time{}
+	}
+	return pa.expiringHeap[len(pa.expiringHeap)-1].Expires
 }
 
 func (pa *peerAddrs) gc(now time.Time) {
-	for len(pa.expiringHeap) > 0 && pa.Peek().ExpiredBy(now) {
+	for len(pa.expiringHeap) > 0 && now.After(pa.NextExpiry()) {
 		heap.Pop(pa)
 	}
 }