change back to using Client method
Jeromy committed
Sep 23, 2014 at 11:45 UTC
414ff34194e275d5b7c7e59cf2eeef2a19c414ee
4 files changed
+18
-13
exchange/bitswap/bitswap_test.go
+1
-2
@@ -281,8 +281,7 @@ func session(net tn.Network, rs mock.RoutingServer, id peer.ID) instance {
281
p := &peer.Peer{ID: id}
282
283
adapter := net.Adapter(p)
284
- htc := mock.NewMockRouter(p, nil)
285
- htc.SetRoutingServer(rs)
284
+ htc := rs.Client(p)
285
286
blockstore := bstore.NewBlockstore(ds.NewMapDatastore())
287
const alwaysSendToPeer = true
exchange/bitswap/testnet/routing.go
deleted
-1
@@ -1 +0,0 @@
1
-package bitswap
exchange/bitswap/testnet/routing_test.go
+7
-9
@@ -43,12 +43,10 @@ func TestSetAndGet(t *testing.T) {
43
}
44
45
func TestClientFindProviders(t *testing.T) {
46
- peer := &peer.Peer{
47
- ID: []byte("42"),
48
- }
46
+ peer := &peer.Peer{ID: []byte("42")}
47
rs := mock.VirtualRoutingServer()
50
- client := mock.NewMockRouter(peer, nil)
51
- client.SetRoutingServer(rs)
48
+ client := rs.Client(peer)
49
+
50
k := u.Key("hello")
51
err := client.Provide(context.Background(), k)
52
if err != nil {
@@ -99,8 +97,9 @@ func TestClientOverMax(t *testing.T) {
97
}
98
99
max := 10
102
- client := mock.NewMockRouter(&peer.Peer{ID: []byte("TODO")}, nil)
103
- client.SetRoutingServer(rs)
100
+ peer := &peer.Peer{ID: []byte("TODO")}
101
+ client := rs.Client(peer)
102
+
103
providersFromClient := client.FindProvidersAsync(context.Background(), k, max)
104
i := 0
105
for _ = range providersFromClient {
@@ -132,8 +131,7 @@ func TestCanceledContext(t *testing.T) {
131
}()
132
133
local := &peer.Peer{ID: []byte("peer id doesn't matter")}
135
- client := mock.NewMockRouter(local, nil)
136
- client.SetRoutingServer(rs)
134
+ client := rs.Client(local)
135
136
t.Log("warning: max is finite so this test is non-deterministic")
137
t.Log("context cancellation could simply take lower priority")
routing/mock/routing.go
+10
-1
@@ -20,7 +20,7 @@ type MockRouter struct {
20
peer *peer.Peer
21
}
22
23
-func NewMockRouter(local *peer.Peer, dstore ds.Datastore) *MockRouter {
23
+func NewMockRouter(local *peer.Peer, dstore ds.Datastore) routing.IpfsRouting {
24
return &MockRouter{
25
datastore: dstore,
26
peer: local,
@@ -84,6 +84,8 @@ type RoutingServer interface {
84
Announce(*peer.Peer, u.Key) error
85
86
Providers(u.Key) []*peer.Peer
87
+
88
+ Client(p *peer.Peer) routing.IpfsRouting
89
}
90
91
func VirtualRoutingServer() RoutingServer {
@@ -128,3 +130,10 @@ func (rs *hashTable) Providers(k u.Key) []*peer.Peer {
130
131
return ret
132
}
133
+
134
+func (rs *hashTable) Client(p *peer.Peer) routing.IpfsRouting {
135
+ return &MockRouter{
136
+ peer: p,
137
+ hashTable: rs,
138
+ }
139
+}