some cleanup before CR

Godeps/Godeps.json

 {
 	"ImportPath": "github.com/jbenet/go-ipfs",
-	"GoVersion": "devel +ffe33f1f1f17 Tue Nov 25 15:41:33 2014 +1100",
+	"GoVersion": "go1.3",
 	"Packages": [
 		"./..."
 	],

exchange/bitswap/bitswap.go

@@ -32,10 +32,6 @@ var providerRequestTimeout = time.Second * 10
 var hasBlockTimeout = time.Second * 15
 var rebroadcastDelay = time.Second * 10
 
-const roundTime = time.Second / 2
-
-var bandwidthPerRound = 500000
-
 // New initializes a BitSwap instance that communicates over the
 // provided BitSwapNetwork. This function registers the returned instance as
 // the network delegate.
@@ -64,7 +60,7 @@ func New(parent context.Context, p peer.Peer, network bsnet.BitSwapNetwork, rout
 	}
 	network.SetDelegate(bs)
 	go bs.clientWorker(ctx)
-	go bs.roundWorker(ctx)
+	go bs.taskWorker(ctx)
 
 	return bs
 }
@@ -90,7 +86,8 @@ type bitswap struct {
 	batchRequests chan []u.Key
 
 	// strategy makes decisions about how to interact with partners.
-	strategy strategy.Strategy
+	// TODO: strategy commented out until we have a use for it again
+	//strategy strategy.Strategy
 
 	ledgermanager *strategy.LedgerManager
 
@@ -234,7 +231,7 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context, wantlist *wl.Wan
 	wg.Wait()
 }
 
-func (bs *bitswap) roundWorker(ctx context.Context) {
+func (bs *bitswap) taskWorker(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():

exchange/bitswap/strategy/interface.go

-package strategy
-
-import (
-	bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-)
-
-type Strategy interface {
-	// Seed initializes the decider to a deterministic state
-	Seed(int64)
-
-	GetTasks(bandwidth int, ledgers *LedgerManager, bs bstore.Blockstore) ([]*Task, error)
-}

exchange/bitswap/wantlist/wantlist.go

@@ -56,6 +56,19 @@ func (es entrySlice) Less(i, j int) bool { return es[i].Priority > es[j].Priorit
 func (w *Wantlist) Entries() []*Entry {
 	w.lk.RLock()
 	defer w.lk.RUnlock()
+
+	var es entrySlice
+
+	for _, e := range w.set {
+		es = append(es, e)
+	}
+	sort.Sort(es)
+	return es
+}
+
+func (w *Wantlist) SortedEntries() []*Entry {
+	w.lk.RLock()
+	defer w.lk.RUnlock()
 	var es entrySlice
 
 	for _, e := range w.set {