From 033e33dadf6ab0aca22e7bbd370598a5ac4b167d Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Sat, 10 Jan 2015 23:17:19 -0800 Subject: [PATCH] feat(core): expose IpfsNode.Resolve --- core/core.go | 5 +++++ core/io/cat.go | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/core.go b/core/core.go index c6ab76ab7..b5b95cf0f 100644 --- a/core/core.go +++ b/core/core.go @@ -29,6 +29,7 @@ import ( pin "github.com/jbenet/go-ipfs/pin" routing "github.com/jbenet/go-ipfs/routing" dht "github.com/jbenet/go-ipfs/routing/dht" + util "github.com/jbenet/go-ipfs/util" ds2 "github.com/jbenet/go-ipfs/util/datastore2" debugerror "github.com/jbenet/go-ipfs/util/debugerror" eventlog "github.com/jbenet/go-ipfs/util/eventlog" @@ -264,6 +265,10 @@ func (n *IpfsNode) OnlineMode() bool { } } +func (n *IpfsNode) Resolve(k util.Key) (*merkledag.Node, error) { + return (&path.Resolver{n.DAG}).ResolvePath(k.String()) +} + func (n *IpfsNode) Bootstrap(ctx context.Context, peers []peer.PeerInfo) error { if n.DHT != nil { for _, p := range peers { diff --git a/core/io/cat.go b/core/io/cat.go index 29dacf9d6..0e0f2712a 100644 --- a/core/io/cat.go +++ b/core/io/cat.go @@ -15,16 +15,14 @@ import ( "io" core "github.com/jbenet/go-ipfs/core" - path "github.com/jbenet/go-ipfs/path" uio "github.com/jbenet/go-ipfs/unixfs/io" u "github.com/jbenet/go-ipfs/util" ) func Cat(n *core.IpfsNode, k u.Key) (io.Reader, error) { - dag := n.DAG - dagNode, err := (&path.Resolver{dag}).ResolvePath(k.String()) + dagNode, err := n.Resolve(k) if err != nil { return nil, err } - return uio.NewDagReader(dagNode, dag) + return uio.NewDagReader(dagNode, n.DAG) }