fix(bitswap) compiler errors
didn't run tests after the refactor. apologies.
Brian Tiger Chow committed
Sep 18, 2014 at 17:43 UTC
ded1f8f5a882e1e6b6577428e37be1d0b855caa8
2 files changed
+9
-9
exchange/bitswap/network/forwarder_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
6
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
- bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
7
+ bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
8
peer "github.com/jbenet/go-ipfs/peer"
9
)
10
exchange/bitswap/strategy/strategy_test.go
+8
-8
@@ -3,20 +3,20 @@ package strategy
3
import (
4
"testing"
5
6
- message "github.com/jbenet/go-ipfs/bitswap/message"
6
+ message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
7
"github.com/jbenet/go-ipfs/peer"
8
"github.com/jbenet/go-ipfs/util/testutil"
9
)
10
11
type peerAndStrategist struct {
12
*peer.Peer
13
- Strategist
13
+ Strategy
14
}
15
16
func newPeerAndStrategist(idStr string) peerAndStrategist {
17
return peerAndStrategist{
18
- Peer: &peer.Peer{ID: peer.ID(idStr)},
19
- Strategist: New(),
18
+ Peer: &peer.Peer{ID: peer.ID(idStr)},
19
+ Strategy: New(),
20
}
21
}
22
@@ -32,7 +32,7 @@ func TestBlockRecordedAsWantedAfterMessageReceived(t *testing.T) {
32
chooser.MessageReceived(beggar.Peer, messageFromBeggarToChooser)
33
// for this test, doesn't matter if you record that beggar sent
34
35
- if !chooser.IsWantedByPeer(block.Key(), beggar.Peer) {
35
+ if !chooser.BlockIsWantedByPeer(block.Key(), beggar.Peer) {
36
t.Fatal("chooser failed to record that beggar wants block")
37
}
38
}
@@ -51,16 +51,16 @@ func TestPeerIsAddedToPeersWhenMessageReceivedOrSent(t *testing.T) {
51
t.Fatal("Sanity Check: Peers have same Key!")
52
}
53
54
- if !peerIsPartner(seattle.Peer, sanfrancisco.Strategist) {
54
+ if !peerIsPartner(seattle.Peer, sanfrancisco.Strategy) {
55
t.Fatal("Peer wasn't added as a Partner")
56
}
57
58
- if !peerIsPartner(sanfrancisco.Peer, seattle.Strategist) {
58
+ if !peerIsPartner(sanfrancisco.Peer, seattle.Strategy) {
59
t.Fatal("Peer wasn't added as a Partner")
60
}
61
}
62
63
-func peerIsPartner(p *peer.Peer, s Strategist) bool {
63
+func peerIsPartner(p *peer.Peer, s Strategy) bool {
64
for _, partner := range s.Peers() {
65
if partner.Key() == p.Key() {
66
return true