Remove deprecated 'FindProviders' method from mock
License: MIT Signed-off-by: Zander Mackie <zmackie@gmail.com>
Zander Mackie committed
Jan 20, 2017 at 16:32 UTC
3f479d1653f3fdf55b47f9401347f18d837fce84
3 files changed
+8
-15
routing/mock/centralized_test.go
+8
-8
@@ -7,7 +7,6 @@ import (
7
8
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
10
-
10
u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
11
cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
12
pstore "gx/ipfs/QmeXj9VAjmYQZxpmVz7VzccbJrpmr8qkCDSjfVNsPTWTYU/go-libp2p-peerstore"
@@ -154,20 +153,21 @@ func TestValidAfter(t *testing.T) {
153
rs.Client(pi).Provide(ctx, key)
154
155
var providers []pstore.PeerInfo
157
- providers, err := rs.Client(pi).FindProviders(ctx, key)
158
- if err != nil {
159
- t.Fatal(err)
156
+ max := 100
157
+ providersChan := rs.Client(pi).FindProvidersAsync(ctx, key, max)
158
+ for p := range providersChan {
159
+ providers = append(providers, p)
160
}
161
if len(providers) > 0 {
162
t.Fail()
163
}
164
165
conf.ValueVisibility.Set(0)
166
- providers, err = rs.Client(pi).FindProviders(ctx, key)
167
- if err != nil {
168
- t.Fatal(err)
169
- }
166
+ providersChan = rs.Client(pi).FindProvidersAsync(ctx, key, max)
167
t.Log("providers", providers)
168
+ for p := range providersChan {
169
+ providers = append(providers, p)
170
+ }
171
if len(providers) != 1 {
172
t.Fail()
173
}
routing/mock/interface.go
-3
@@ -12,8 +12,6 @@ import (
12
13
ds "gx/ipfs/QmRWDav6mzWseLWeYfVd5fvUKiVe9xNH29YfMF438fG364/go-datastore"
14
routing "gx/ipfs/QmbkGVaN9W6RYJK4Ws5FvMKXKDqdRQ5snhtaa92qP6L8eU/go-libp2p-routing"
15
- cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
16
- pstore "gx/ipfs/QmeXj9VAjmYQZxpmVz7VzccbJrpmr8qkCDSjfVNsPTWTYU/go-libp2p-peerstore"
15
peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
)
17
@@ -25,7 +23,6 @@ type Server interface {
23
24
// Client implements IpfsRouting
25
type Client interface {
28
- FindProviders(context.Context, *cid.Cid) ([]pstore.PeerInfo, error)
26
routing.IpfsRouting
27
}
28
routing/offline/offline.go
-4
@@ -91,10 +91,6 @@ func (c *offlineRouting) GetValues(ctx context.Context, key string, _ int) ([]ro
91
}, nil
92
}
93
94
-func (c *offlineRouting) FindProviders(ctx context.Context, key *cid.Cid) ([]pstore.PeerInfo, error) {
95
- return nil, ErrOffline
96
-}
97
-
94
func (c *offlineRouting) FindPeer(ctx context.Context, pid peer.ID) (pstore.PeerInfo, error) {
95
return pstore.PeerInfo{}, ErrOffline
96
}