From 8451a895dbec88fe1e003c450ae4574b0bc76e39 Mon Sep 17 00:00:00 2001 From: Zander Mackie Date: Fri, 20 Jan 2017 16:32:15 -0500 Subject: [PATCH] Remove deprecated 'FindProviders' method from mock License: MIT Signed-off-by: Zander Mackie --- mock/centralized_test.go | 16 ++++++++-------- mock/interface.go | 3 --- offline/offline.go | 4 ---- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/mock/centralized_test.go b/mock/centralized_test.go index 13c3708..5aca0b0 100644 --- a/mock/centralized_test.go +++ b/mock/centralized_test.go @@ -7,7 +7,6 @@ import ( delay "github.com/ipfs/go-ipfs/thirdparty/delay" "github.com/ipfs/go-ipfs/thirdparty/testutil" - u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util" cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid" pstore "gx/ipfs/QmeXj9VAjmYQZxpmVz7VzccbJrpmr8qkCDSjfVNsPTWTYU/go-libp2p-peerstore" @@ -154,20 +153,21 @@ func TestValidAfter(t *testing.T) { rs.Client(pi).Provide(ctx, key) var providers []pstore.PeerInfo - providers, err := rs.Client(pi).FindProviders(ctx, key) - if err != nil { - t.Fatal(err) + max := 100 + providersChan := rs.Client(pi).FindProvidersAsync(ctx, key, max) + for p := range providersChan { + providers = append(providers, p) } if len(providers) > 0 { t.Fail() } conf.ValueVisibility.Set(0) - providers, err = rs.Client(pi).FindProviders(ctx, key) - if err != nil { - t.Fatal(err) - } + providersChan = rs.Client(pi).FindProvidersAsync(ctx, key, max) t.Log("providers", providers) + for p := range providersChan { + providers = append(providers, p) + } if len(providers) != 1 { t.Fail() } diff --git a/mock/interface.go b/mock/interface.go index 28217d6..91dbc1d 100644 --- a/mock/interface.go +++ b/mock/interface.go @@ -12,8 +12,6 @@ import ( ds "gx/ipfs/QmRWDav6mzWseLWeYfVd5fvUKiVe9xNH29YfMF438fG364/go-datastore" routing "gx/ipfs/QmbkGVaN9W6RYJK4Ws5FvMKXKDqdRQ5snhtaa92qP6L8eU/go-libp2p-routing" - cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid" - pstore "gx/ipfs/QmeXj9VAjmYQZxpmVz7VzccbJrpmr8qkCDSjfVNsPTWTYU/go-libp2p-peerstore" peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer" ) @@ -25,7 +23,6 @@ type Server interface { // Client implements IpfsRouting type Client interface { - FindProviders(context.Context, *cid.Cid) ([]pstore.PeerInfo, error) routing.IpfsRouting } diff --git a/offline/offline.go b/offline/offline.go index 5664661..7813208 100644 --- a/offline/offline.go +++ b/offline/offline.go @@ -91,10 +91,6 @@ func (c *offlineRouting) GetValues(ctx context.Context, key string, _ int) ([]ro }, nil } -func (c *offlineRouting) FindProviders(ctx context.Context, key *cid.Cid) ([]pstore.PeerInfo, error) { - return nil, ErrOffline -} - func (c *offlineRouting) FindPeer(ctx context.Context, pid peer.ID) (pstore.PeerInfo, error) { return pstore.PeerInfo{}, ErrOffline } -- GitLab