From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 18 Oct 2021 05:31:16 +0000 (+1100)
Subject: Use roaring.Bitmap.IsEmpty where appropriate
X-Git-Tag: v1.34.0^2~31
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=a7d329600341ca4ff4b243cfe3f36d6ff13b5dfb;p=btrtrc.git

Use roaring.Bitmap.IsEmpty where appropriate
---

diff --git a/peerconn.go b/peerconn.go
index a7cf7d2e..eebfc029 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -625,7 +625,7 @@ func (me *PeerConn) _cancel(r RequestIndex) bool {
 		if !me.deleteRequest(r) {
 			panic("request not existing should have been guarded")
 		}
-		if me.actualRequestState.Requests.GetCardinality() == 0 {
+		if me.actualRequestState.Requests.IsEmpty() {
 			me.updateRequests("Peer.cancel")
 		}
 	}
@@ -1172,7 +1172,7 @@ func (c *PeerConn) mainReadLoop() (err error) {
 
 func (c *Peer) remoteRejectedRequest(r RequestIndex) {
 	if c.deleteRequest(r) {
-		if c.actualRequestState.Requests.GetCardinality() == 0 {
+		if c.actualRequestState.Requests.IsEmpty() {
 			c.updateRequests("Peer.remoteRejectedRequest")
 		}
 		c.decExpectedChunkReceive(r)
@@ -1311,7 +1311,7 @@ func (c *Peer) receiveChunk(msg *pp.Message) error {
 			if !c.peerChoking {
 				c._chunksReceivedWhileExpecting++
 			}
-			if c.actualRequestState.Requests.GetCardinality() == 0 {
+			if c.actualRequestState.Requests.IsEmpty() {
 				c.updateRequests("Peer.receiveChunk deleted request")
 			}
 		} else {
diff --git a/torrent.go b/torrent.go
index e9295824..9af6a44d 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1085,7 +1085,7 @@ func (t *Torrent) piecePriorityChanged(piece pieceIndex, reason string) {
 			if c.actualRequestState.Interested {
 				return
 			}
-			if c.actualRequestState.Requests.GetCardinality() != 0 {
+			if !c.actualRequestState.Requests.IsEmpty() {
 				return
 			}
 			if !c.peerHasPiece(piece) {
diff --git a/webseed-peer.go b/webseed-peer.go
index d2c46681..8105a4bf 100644
--- a/webseed-peer.go
+++ b/webseed-peer.go
@@ -52,7 +52,7 @@ func (ws *webseedPeer) _cancel(r RequestIndex) bool {
 		if !ws.peer.deleteRequest(r) {
 			panic("cancelled webseed request should exist")
 		}
-		if ws.peer.actualRequestState.Requests.GetCardinality() == 0 {
+		if ws.peer.actualRequestState.Requests.IsEmpty() {
 			ws.peer.updateRequests("webseedPeer._cancel")
 		}
 	}