Use roaring.Bitmap.IsEmpty where appropriate

diff --git a/peerconn.go b/peerconn.go
index a7cf7d2ead2340bd675e9f3508372e7c613b0ad1..eebfc029c7a4b1a3af449ffa8e7c4b3f1e4550c6 100644 (file)
--- 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 e929582479f76b05343447365a77db44fdbb023b..9af6a44d4fdf135c821995dd61800948e7bf06bf 100644 (file)
--- 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 d2c466816b4c405d568a61991450a75e060ae206..8105a4bf546ba07f7137d60bfd7535503cccaad3 100644 (file)
--- 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")
                }
        }