path: fix dag tests
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Jul 21, 2018 at 17:29 UTC
492a4fc46bacd2c34d55740bb140d8d076e4533d
1 file changed
+7
-4
path/resolver/resolver.go
+7
-4
@@ -70,11 +70,11 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld
70
71
for len(p) > 0 {
72
lnk, rest, err := r.ResolveOnce(ctx, r.DAG, nd, p)
73
- if err != nil {
74
- return nil, nil, err
75
- }
76
-
73
if lnk != nil {
74
+ if err != nil {
75
+ return nil, nil, err
76
+ }
77
+
78
next, err := lnk.GetNode(ctx, r.DAG)
79
if err != nil {
80
return nil, nil, err
@@ -85,6 +85,9 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (ipld
85
}
86
87
val, rest, err := nd.Resolve(p)
88
+ if err != nil {
89
+ return nil, nil, err
90
+ }
91
switch val.(type) {
92
case *ipld.Link:
93
return nil, nil, errors.New("inconsistent ResolveOnce / nd.Resolve")