From 492a4fc46bacd2c34d55740bb140d8d076e4533d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Sat, 21 Jul 2018 17:29:18 +0200 Subject: [PATCH] path: fix dag tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera --- path/resolver/resolver.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/path/resolver/resolver.go b/path/resolver/resolver.go index 2aa247645..e7a95a83e 100644 --- a/path/resolver/resolver.go +++ b/path/resolver/resolver.go @@ -70,11 +70,11 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld for len(p) > 0 { lnk, rest, err := r.ResolveOnce(ctx, r.DAG, nd, p) - if err != nil { - return nil, nil, err - } - if lnk != nil { + if err != nil { + return nil, nil, err + } + next, err := lnk.GetNode(ctx, r.DAG) if err != nil { return nil, nil, err @@ -85,6 +85,9 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld } val, rest, err := nd.Resolve(p) + if err != nil { + return nil, nil, err + } switch val.(type) { case *ipld.Link: return nil, nil, errors.New("inconsistent ResolveOnce / nd.Resolve")