Address CR comment

rht · rht · commit 5ac132e3eada · 2015-11-23T07:55:50.000+07:00
License: MIT
Signed-off-by: rht &lt;rhtbot@gmail.com&gt;
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
@@ -208,12 +208,6 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []key.Key) (<-chan *block
 		log.Event(ctx, "Bitswap.GetBlockRequest.Start", &k)
 	}
 
-	go func() {
-		select {
-		case <-ctx.Done(): // ctx is canceled
-			bs.CancelWants(keys)
-		}
-	}()
 	bs.wm.WantBlocks(keys)
 
 	req := &blockRequest{
@@ -224,6 +218,7 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []key.Key) (<-chan *block
 	case bs.findKeys <- req:
 		return promise, nil
 	case <-ctx.Done():
+		bs.CancelWants(keys)
 		return nil, ctx.Err()
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -208,12 +208,6 @@ func (bs Bitswap) GetBlocks(ctx context.Context, keys []key.Key) (<-chan block`
`208`	`208`	`log.Event(ctx, "Bitswap.GetBlockRequest.Start", &k)`
`209`	`209`	`}`
`210`	`210`
`211`		`- go func() {`
`212`		`- select {`
`213`		`- case <-ctx.Done(): // ctx is canceled`
`214`		`- bs.CancelWants(keys)`
`215`		`- }`
`216`		`- }()`
`217`	`211`	`bs.wm.WantBlocks(keys)`
`218`	`212`
`219`	`213`	`req := &blockRequest{`
`@@ -224,6 +218,7 @@ func (bs Bitswap) GetBlocks(ctx context.Context, keys []key.Key) (<-chan block`
`224`	`218`	`case bs.findKeys <- req:`
`225`	`219`	`return promise, nil`
`226`	`220`	`case <-ctx.Done():`
	`221`	`+ bs.CancelWants(keys)`
`227`	`222`	`return nil, ctx.Err()`
`228`	`223`	`}`
`229`	`224`	`}`