From 88a38e667a8bbb48337adfd77ee7ba0448bb3c10 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 6 Aug 2018 22:11:30 -0700 Subject: [PATCH] modifications for ResolveToLastNode changes see: https://github.com/ipfs/go-path/pull/1 License: MIT Signed-off-by: Steven Allen --- core/commands/dag/dag.go | 11 ++++++++--- core/coreapi/path.go | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 365270133..cc14bebc0 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -207,7 +207,12 @@ format. return } - obj, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p) + lastCid, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p) + if err != nil { + res.SetError(err, cmdkit.ErrNormal) + return + } + obj, err := n.DAG.Get(req.Context(), lastCid) if err != nil { res.SetError(err, cmdkit.ErrNormal) return @@ -251,14 +256,14 @@ var DagResolveCmd = &cmds.Command{ return } - obj, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p) + lastCid, rem, err := n.Resolver.ResolveToLastNode(req.Context(), p) if err != nil { res.SetError(err, cmdkit.ErrNormal) return } res.SetOutput(&ResolveOutput{ - Cid: obj.Cid(), + Cid: lastCid, RemPath: path.Join(rem), }) }, diff --git a/core/coreapi/path.go b/core/coreapi/path.go index 900adb14b..f032a7a4f 100644 --- a/core/coreapi/path.go +++ b/core/coreapi/path.go @@ -80,5 +80,5 @@ func resolvePath(ctx context.Context, ng ipld.NodeGetter, nsys namesys.NameSyste return nil, err } - return coreiface.NewResolvedPath(ipath, node.Cid(), root, gopath.Join(rest...)), nil + return coreiface.NewResolvedPath(ipath, node, root, gopath.Join(rest...)), nil }