opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

coreapi: dht: remove option prefix

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-08-28 02:22:09 +02:00
committed by Steven Allen
parent 7139b83666
commit 86f9eb73c3
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/coreapi/dht.go
View File

@ -103,9 +103,8 @@ func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Bl
errCh := make(chan error) errCh := make(chan error)
go func() { go func() {
dserv := dag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
for _, c := range cids { for _, c := range cids {
dserv := dag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
err := dag.EnumerateChildrenAsync(ctx, dag.GetLinksDirect(dserv), c, provided.Visitor(ctx)) err := dag.EnumerateChildrenAsync(ctx, dag.GetLinksDirect(dserv), c, provided.Visitor(ctx))
if err != nil { if err != nil {
errCh <- err errCh <- err

6
core/coreapi/dht_test.go
View File

@ -51,7 +51,7 @@ func TestDhtFindProviders(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1)) out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -80,7 +80,7 @@ func TestDhtProvide(t *testing.T) {
nds[0].Blockstore.Put(b) nds[0].Blockstore.Put(b)
p := iface.IpfsPath(b.Cid()) p := iface.IpfsPath(b.Cid())
out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1)) out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -96,7 +96,7 @@ func TestDhtProvide(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
out, err = apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1)) out, err = apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

8
core/coreapi/interface/options/dht.go
View File

@ -43,18 +43,18 @@ type dhtOpts struct{}
var Dht dhtOpts var Dht dhtOpts
// WithRecursive is an option for Dht.Provide which specifies whether to provide // Recursive is an option for Dht.Provide which specifies whether to provide
// the given path recursively // the given path recursively
func (dhtOpts) WithRecursive(recursive bool) DhtProvideOption { func (dhtOpts) Recursive(recursive bool) DhtProvideOption {
return func(settings *DhtProvideSettings) error { return func(settings *DhtProvideSettings) error {
settings.Recursive = recursive settings.Recursive = recursive
return nil return nil
} }
} }
// WithNumProviders is an option for Dht.FindProviders which specifies the // NumProviders is an option for Dht.FindProviders which specifies the
// number of peers to look for. Default is 20 // number of peers to look for. Default is 20
func (dhtOpts) WithNumProviders(numProviders int) DhtFindProvidersOption { func (dhtOpts) NumProviders(numProviders int) DhtFindProvidersOption {
return func(settings *DhtFindProvidersSettings) error { return func(settings *DhtFindProvidersSettings) error {
settings.NumProviders = numProviders settings.NumProviders = numProviders
return nil return nil