fix(bitswap) compiler errors

didn't run tests after the refactor. apologies.

exchange/bitswap/network/forwarder_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
-	bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
+	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
 	peer "github.com/jbenet/go-ipfs/peer"
 )
 

exchange/bitswap/strategy/strategy_test.go

@@ -3,20 +3,20 @@ package strategy
 import (
 	"testing"
 
-	message "github.com/jbenet/go-ipfs/bitswap/message"
+	message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
 	"github.com/jbenet/go-ipfs/peer"
 	"github.com/jbenet/go-ipfs/util/testutil"
 )
 
 type peerAndStrategist struct {
 	*peer.Peer
-	Strategist
+	Strategy
 }
 
 func newPeerAndStrategist(idStr string) peerAndStrategist {
 	return peerAndStrategist{
-		Peer:       &peer.Peer{ID: peer.ID(idStr)},
-		Strategist: New(),
+		Peer:     &peer.Peer{ID: peer.ID(idStr)},
+		Strategy: New(),
 	}
 }
 
@@ -32,7 +32,7 @@ func TestBlockRecordedAsWantedAfterMessageReceived(t *testing.T) {
 	chooser.MessageReceived(beggar.Peer, messageFromBeggarToChooser)
 	// for this test, doesn't matter if you record that beggar sent
 
-	if !chooser.IsWantedByPeer(block.Key(), beggar.Peer) {
+	if !chooser.BlockIsWantedByPeer(block.Key(), beggar.Peer) {
 		t.Fatal("chooser failed to record that beggar wants block")
 	}
 }
@@ -51,16 +51,16 @@ func TestPeerIsAddedToPeersWhenMessageReceivedOrSent(t *testing.T) {
 		t.Fatal("Sanity Check: Peers have same Key!")
 	}
 
-	if !peerIsPartner(seattle.Peer, sanfrancisco.Strategist) {
+	if !peerIsPartner(seattle.Peer, sanfrancisco.Strategy) {
 		t.Fatal("Peer wasn't added as a Partner")
 	}
 
-	if !peerIsPartner(sanfrancisco.Peer, seattle.Strategist) {
+	if !peerIsPartner(sanfrancisco.Peer, seattle.Strategy) {
 		t.Fatal("Peer wasn't added as a Partner")
 	}
 }
 
-func peerIsPartner(p *peer.Peer, s Strategist) bool {
+func peerIsPartner(p *peer.Peer, s Strategy) bool {
 	for _, partner := range s.Peers() {
 		if partner.Key() == p.Key() {
 			return true