clean up wantlists on non-session success case

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
ipfs · May 2, 2017 · 47239ec · 47239ec
1 parent f39ac4e
commit 47239ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
@@ -255,6 +255,7 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []*cid.Cid) (<-chan block
 					return
 				}
 
+				bs.CancelWants([]*cid.Cid{blk.Cid()}, mses)
 				remaining.Remove(blk.Cid())
 				select {
 				case out <- blk:
@@ -371,6 +372,7 @@ func (bs *Bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
 
 			for _, ses := range bs.SessionsForBlock(k) {
 				ses.ReceiveBlock(p, b)
+				bs.CancelWants([]*cid.Cid{k}, ses.id)
 			}
 			log.Debugf("got block %s from %s", b, p)
 			if err := bs.HasBlock(b); err != nil {

diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go
@@ -341,6 +341,11 @@ func TestBasicBitswap(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	time.Sleep(time.Millisecond * 20)
+	if len(instances[1].Exchange.GetWantlist()) != 0 {
+		t.Fatal("shouldnt have anything in wantlist")
+	}
+
 	st0, err := instances[0].Exchange.Stat()
 	if err != nil {
 		t.Fatal(err)