modifications for ResolveToLastNode changes
see: https://github.com/ipfs/go-path/pull/1 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Aug 6, 2018 at 22:11 UTC
88a38e667a8bbb48337adfd77ee7ba0448bb3c10
2 files changed
+9
-4
core/commands/dag/dag.go
+8
-3
@@ -207,7 +207,12 @@ format.
207
return
208
}
209
210
- obj, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p)
210
+ lastCid, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p)
211
+ if err != nil {
212
+ res.SetError(err, cmdkit.ErrNormal)
213
+ return
214
+ }
215
+ obj, err := n.DAG.Get(req.Context(), lastCid)
216
if err != nil {
217
res.SetError(err, cmdkit.ErrNormal)
218
return
@@ -251,14 +256,14 @@ var DagResolveCmd = &cmds.Command{
256
return
257
}
258
254
- obj, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p)
259
+ lastCid, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p)
260
if err != nil {
261
res.SetError(err, cmdkit.ErrNormal)
262
return
263
}
264
265
res.SetOutput(&ResolveOutput{
261
- Cid: obj.Cid(),
266
+ Cid: lastCid,
267
RemPath: path.Join(rem),
268
})
269
},
core/coreapi/path.go
+1
-1
@@ -80,5 +80,5 @@ func resolvePath(ctx context.Context, ng ipld.NodeGetter, nsys namesys.NameSyste
80
return nil, err
81
}
82
83
- return coreiface.NewResolvedPath(ipath, node.Cid(), root, gopath.Join(rest...)), nil
83
+ return coreiface.NewResolvedPath(ipath, node, root, gopath.Join(rest...)), nil
84
}