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

namesys: async: go vet fixes

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-08-28 01:06:12 +02:00
parent 7ff9f09b07
commit 6adb15f4fb
5 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/corehttp/gateway_test.go
View File

@ -35,7 +35,7 @@ type mockNamesys map[string]path.Path
func (m mockNamesys) Resolve(ctx context.Context, name string, opts ...nsopts.ResolveOpt) (value path.Path, err error) {
cfg := nsopts.DefaultResolveOpts()
for _, o := range opts {
o(cfg)
o(&cfg)
}
depth := cfg.Depth
if depth == nsopts.UnlimitedDepth {
@ -57,6 +57,14 @@ func (m mockNamesys) Resolve(ctx context.Context, name string, opts ...nsopts.Re
return value, nil
}
func (m mockNamesys) ResolveAsync(ctx context.Context, name string, opts ...nsopts.ResolveOpt) <-chan namesys.Result {
out := make(chan namesys.Result, 1)
v, err := m.Resolve(ctx, name, opts...)
out <- namesys.Result{Path: v, Err: err}
close(out)
return nil
}
func (m mockNamesys) Publish(ctx context.Context, name ci.PrivKey, value path.Path) error {
return errors.New("not implemented for mockNamesys")
}

24
namesys/base.go
View File

@ -68,23 +68,24 @@ func resolveAsyncDo(ctx context.Context, r resolver, name string, options opts.R
for {
select {
case res, ok := <-resCh:
if res.err != nil {
outCh <- Result{err: res.err}
return
}
if !ok {
resCh = nil
continue
}
if res.err != nil {
outCh <- Result{Err: res.err}
return
}
log.Debugf("resolved %s to %s", name, res.value.String())
if strings.HasPrefix(res.value.String(), "/ipfs/") {
outCh <- Result{err: res.err}
outCh <- Result{Err: res.err}
continue
}
p := strings.TrimPrefix(res.value.String(), prefix)
if depth == 1 {
outCh <- Result{err: ErrResolveRecursion}
outCh <- Result{Err: ErrResolveRecursion}
continue
}
@ -99,17 +100,20 @@ func resolveAsyncDo(ctx context.Context, r resolver, name string, options opts.R
cancelSub()
}
subCtx, cancelSub = context.WithCancel(ctx)
defer cancelSub()
subCh = resolveAsyncDo(subCtx, r, p, subopts, prefix)
case res, ok := <-subCh:
if res.err != nil {
outCh <- Result{err: res.err}
return
}
if !ok {
subCh = nil
continue
}
if res.Err != nil {
outCh <- Result{Err: res.Err}
return
}
outCh <- res
case <-ctx.Done():
}

8
namesys/dns.go
View File

@ -31,6 +31,10 @@ func (r *DNSResolver) Resolve(ctx context.Context, name string, options ...opts.
return resolve(ctx, r, name, opts.ProcessOpts(options), "/ipns/")
}
func (r *DNSResolver) ResolveAsync(ctx context.Context, name string, options ...opts.ResolveOpt) <-chan Result {
return resolveAsync(ctx, r, name, opts.ProcessOpts(options), "/ipns/")
}
type lookupRes struct {
path path.Path
error error
@ -112,8 +116,8 @@ func (r *DNSResolver) resolveOnceAsync(ctx context.Context, name string, options
}
if subRes.error == nil {
select {
case out <- onceResult{value: subRes.path}:
case <-ctx.Done():
case out <- onceResult{value: subRes.path}:
case <-ctx.Done():
}
return
}

4
namesys/interface.go
View File

@ -65,8 +65,8 @@ type NameSystem interface {
// Result is the return type for Resolver.ResolveAsync.
type Result struct {
path path.Path
err error
Path path.Path
Err error
}
// Resolver is an object capable of resolving names.

6
namesys/namesys_test.go
View File

@ -38,11 +38,15 @@ func testResolution(t *testing.T, resolver Resolver, name string, depth uint, ex
}
}
func (r *mockResolver) resolveOnce(ctx context.Context, name string, opts *opts.ResolveOpts) (path.Path, time.Duration, error) {
func (r *mockResolver) resolveOnce(ctx context.Context, name string, opts opts.ResolveOpts) (path.Path, time.Duration, error) {
p, err := path.ParsePath(r.entries[name])
return p, 0, err
}
func (r *mockResolver) resolveOnceAsync(ctx context.Context, name string, options opts.ResolveOpts) <-chan onceResult {
panic("stub")
}
func mockResolverOne() *mockResolver {
return &mockResolver{
entries: map[string]string{