coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-21 18:37:45 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

modifications for ResolveToLastNode changes

Browse Source 
see: https://github.com/ipfs/go-path/pull/1

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
This commit is contained in:
Steven Allen 2018-08-06 22:11:30 -07:00
parent 3e13277dd4
commit 88a38e667a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/commands/dag/dag.go
View File

@ -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),
})
},

2
core/coreapi/path.go
View File

@ -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
}