From efa442ada2b0a709cf98f29d0882fdf9539a2c80 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Mon, 25 May 2015 18:00:34 -0700
Subject: [PATCH] adjust naming
---
exchange/bitswap/bitswap.go | 10 ++++------
exchange/bitswap/workers.go | 8 ++++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index f849c1ed9..58243e888 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -82,7 +82,7 @@ func New(parent context.Context, p peer.ID, network bsnet.BitSwapNetwork,
notifications: notif,
engine: decision.NewEngine(ctx, bstore), // TODO close the engine with Close() method
network: network,
- batchRequests: make(chan *blockRequest, sizeBatchRequestChan),
+ findKeys: make(chan *blockRequest, sizeBatchRequestChan),
process: px,
newBlocks: make(chan *blocks.Block, HasBlockBufferSize),
provideKeys: make(chan u.Key),
@@ -115,10 +115,8 @@ type Bitswap struct {
notifications notifications.PubSub
- // Requests for a set of related blocks
- // the assumption is made that the same peer is likely to
- // have more than a single block in the set
- batchRequests chan *blockRequest
+ // send keys to a worker to find and connect to providers for them
+ findKeys chan *blockRequest
engine *decision.Engine
@@ -209,7 +207,7 @@ func (bs *Bitswap) GetBlocks(ctx context.Context, keys []u.Key) (<-chan *blocks.
ctx: ctx,
}
select {
- case bs.batchRequests <- req:
+ case bs.findKeys <- req:
return promise, nil
case <-ctx.Done():
return nil, ctx.Err()
diff --git a/exchange/bitswap/workers.go b/exchange/bitswap/workers.go
index b41f0dd30..7852cf93e 100644
--- a/exchange/bitswap/workers.go
+++ b/exchange/bitswap/workers.go
@@ -31,7 +31,7 @@ func init() {
func (bs *Bitswap) startWorkers(px process.Process, ctx context.Context) {
// Start up a worker to handle block requests this node is making
px.Go(func(px process.Process) {
- bs.clientWorker(ctx)
+ bs.providerConnector(ctx)
})
// Start up workers to handle requests from other nodes for the data on this node
@@ -134,13 +134,13 @@ func (bs *Bitswap) provideCollector(ctx context.Context) {
}
}
-// TODO: figure out clientWorkers purpose in life
-func (bs *Bitswap) clientWorker(parent context.Context) {
+// connects to providers for the given keys
+func (bs *Bitswap) providerConnector(parent context.Context) {
defer log.Info("bitswap client worker shutting down...")
for {
select {
- case req := <-bs.batchRequests:
+ case req := <-bs.findKeys:
keys := req.keys
if len(keys) == 0 {
log.Warning("Received batch request for zero blocks")
--
GitLab