Extract pendingRequests

[btrtrc.git] / peerconn.go

diff --git a/peerconn.go b/peerconn.go
index dc4ce8d13714d4add7bb2461d8fa11a3e93d39ea..f0efb19dd00aee36ded2712bab52bec1aa98fd7f 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -588,7 +588,7 @@ func (cn *Peer) request(r RequestIndex) (more bool, err error) {
                cn.validReceiveChunks = make(map[RequestIndex]int)
        }
        cn.validReceiveChunks[r]++
-       cn.t.pendingRequests[r]++
+       cn.t.pendingRequests.Inc(r)
        cn.updateExpectingChunks()
        ppReq := cn.t.requestIndexToRequest(r)
        for _, f := range cn.callbacks.SentRequest {
@@ -1431,15 +1431,7 @@ func (c *Peer) deleteRequest(r RequestIndex) bool {
                f(PeerRequestEvent{c, c.t.requestIndexToRequest(r)})
        }
        c.updateExpectingChunks()
-       pr := c.t.pendingRequests
-       pr[r]--
-       n := pr[r]
-       if n == 0 {
-               delete(pr, r)
-       }
-       if n < 0 {
-               panic(n)
-       }
+       c.t.pendingRequests.Dec(r)
        return true
 }