tq.Cancel -> tq.Remove
License: MIT Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
Brian Tiger Chow committed
Dec 16, 2014 at 21:42 UTC
181ff4eab1063475bd833c11e6343c409b658785
2 files changed
+4
-4
exchange/bitswap/strategy/ledgermanager.go
+2
-2
@@ -124,7 +124,7 @@ func (lm *LedgerManager) MessageReceived(p peer.Peer, m bsmsg.BitSwapMessage) er
124
for _, e := range m.Wantlist() {
125
if e.Cancel {
126
l.CancelWant(e.Key)
127
- lm.taskqueue.Cancel(e.Key, p)
127
+ lm.taskqueue.Remove(e.Key, p)
128
} else {
129
l.Wants(e.Key, e.Priority)
130
newWorkExists = true
@@ -159,7 +159,7 @@ func (lm *LedgerManager) MessageSent(p peer.Peer, m bsmsg.BitSwapMessage) error
159
for _, block := range m.Blocks() {
160
l.SentBytes(len(block.Data))
161
l.wantList.Remove(block.Key())
162
- lm.taskqueue.Cancel(block.Key(), p)
162
+ lm.taskqueue.Remove(block.Key(), p)
163
}
164
165
return nil
exchange/bitswap/strategy/taskqueue.go
+2
-2
@@ -62,8 +62,8 @@ func (tl *taskQueue) Pop() *Task {
62
return out
63
}
64
65
-// Cancel lazily cancels the sending of a block to a given peer
66
-func (tl *taskQueue) Cancel(k u.Key, p peer.Peer) {
65
+// Remove lazily removes a task from the queue
66
+func (tl *taskQueue) Remove(k u.Key, p peer.Peer) {
67
t, ok := tl.taskmap[taskKey(p, k)]
68
if ok {
69
t.theirPriority = -1