path: WIP

Author: magik6k

block.go

@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 // BlockStat contains information about a block
@@ -13,7 +14,7 @@ type BlockStat interface {
 	Size() int
 
 	// Path returns path to the block
-	Path() ResolvedPath
+	Path() path.ResolvedPath
 }
 
 // BlockAPI specifies the interface to the block layer
@@ -22,15 +23,15 @@ type BlockAPI interface {
 	Put(context.Context, io.Reader, ...options.BlockPutOption) (BlockStat, error)
 
 	// Get attempts to resolve the path and return a reader for data in the block
-	Get(context.Context, Path) (io.Reader, error)
+	Get(context.Context, path.Path) (io.Reader, error)
 
 	// Rm removes the block specified by the path from local blockstore.
 	// By default an error will be returned if the block can't be found locally.
 	//
 	// NOTE: If the specified block is pinned it won't be removed and no error
 	// will be returned
-	Rm(context.Context, Path, ...options.BlockRmOption) error
+	Rm(context.Context, path.Path, ...options.BlockRmOption) error
 
 	// Stat returns information on
-	Stat(context.Context, Path) (BlockStat, error)
+	Stat(context.Context, path.Path) (BlockStat, error)
 }

coreapi.go

@@ -4,6 +4,7 @@ package iface
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
@@ -43,11 +44,11 @@ type CoreAPI interface {
 	PubSub() PubSubAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
-	ResolvePath(context.Context, Path) (ResolvedPath, error)
+	ResolvePath(context.Context, path.Path) (path.ResolvedPath, error)
 
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
-	ResolveNode(context.Context, Path) (ipld.Node, error)
+	ResolveNode(context.Context, path.Path) (ipld.Node, error)
 
 	// WithOptions creates new instance of CoreAPI based on this instance with
 	// a set of options applied

dht.go

@@ -2,10 +2,11 @@ package iface
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	peer "github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 )
 
@@ -19,8 +20,8 @@ type DhtAPI interface {
 
 	// FindProviders finds peers in the DHT who can provide a specific value
 	// given a key.
-	FindProviders(context.Context, Path, ...options.DhtFindProvidersOption) (<-chan pstore.PeerInfo, error)
+	FindProviders(context.Context, path.Path, ...options.DhtFindProvidersOption) (<-chan pstore.PeerInfo, error)
 
 	// Provide announces to the network that you are providing given values
-	Provide(context.Context, Path, ...options.DhtProvideOption) error
+	Provide(context.Context, path.Path, ...options.DhtProvideOption) error
 }

key.go

@@ -2,8 +2,9 @@ package iface
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/libp2p/go-libp2p-peer"
 )
@@ -14,7 +15,7 @@ type Key interface {
 	Name() string
 
 	// Path returns key path
-	Path() Path
+	Path() path.Path
 
 	// ID returns key PeerID
 	ID() peer.ID

name.go

@@ -3,8 +3,9 @@ package iface
 import (
 	"context"
 	"errors"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var ErrResolveFailed = errors.New("could not resolve name")
@@ -14,11 +15,11 @@ type IpnsEntry interface {
 	// Name returns IpnsEntry name
 	Name() string
 	// Value returns IpnsEntry value
-	Value() Path
+	Value() path.Path
 }
 
 type IpnsResult struct {
-	Path
+	path.Path
 	Err error
 }
 
@@ -32,10 +33,10 @@ type IpnsResult struct {
 // You can use .Key API to list and generate more names and their respective keys.
 type NameAPI interface {
 	// Publish announces new IPNS name
-	Publish(ctx context.Context, path Path, opts ...options.NamePublishOption) (IpnsEntry, error)
+	Publish(ctx context.Context, path path.Path, opts ...options.NamePublishOption) (IpnsEntry, error)
 
 	// Resolve attempts to resolve the newest version of the specified name
-	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
+	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (path.Path, error)
 
 	// Search is a version of Resolve which outputs paths as they are discovered,
 	// reducing the time to first entry

object.go

@@ -2,11 +2,12 @@ package iface
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
 )
 
@@ -58,11 +59,11 @@ type ObjectChange struct {
 
 	// Before holds the link path before the change. Note that when a link is
 	// added, this will be nil.
-	Before ResolvedPath
+	Before path.ResolvedPath
 
 	// After holds the link path after the change. Note that when a link is
 	// removed, this will be nil.
-	After ResolvedPath
+	After path.ResolvedPath
 }
 
 // ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
@@ -72,35 +73,35 @@ type ObjectAPI interface {
 	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
 
 	// Put imports the data into merkledag
-	Put(context.Context, io.Reader, ...options.ObjectPutOption) (ResolvedPath, error)
+	Put(context.Context, io.Reader, ...options.ObjectPutOption) (path.ResolvedPath, error)
 
 	// Get returns the node for the path
-	Get(context.Context, Path) (ipld.Node, error)
+	Get(context.Context, path.Path) (ipld.Node, error)
 
 	// Data returns reader for data of the node
-	Data(context.Context, Path) (io.Reader, error)
+	Data(context.Context, path.Path) (io.Reader, error)
 
 	// Links returns lint or links the node contains
-	Links(context.Context, Path) ([]*ipld.Link, error)
+	Links(context.Context, path.Path) ([]*ipld.Link, error)
 
 	// Stat returns information about the node
-	Stat(context.Context, Path) (*ObjectStat, error)
+	Stat(context.Context, path.Path) (*ObjectStat, error)
 
 	// AddLink adds a link under the specified path. child path can point to a
 	// subdirectory within the patent which must be present (can be overridden
 	// with WithCreate option).
-	AddLink(ctx context.Context, base Path, name string, child Path, opts ...options.ObjectAddLinkOption) (ResolvedPath, error)
+	AddLink(ctx context.Context, base path.Path, name string, child path.Path, opts ...options.ObjectAddLinkOption) (path.ResolvedPath, error)
 
 	// RmLink removes a link from the node
-	RmLink(ctx context.Context, base Path, link string) (ResolvedPath, error)
+	RmLink(ctx context.Context, base path.Path, link string) (path.ResolvedPath, error)
 
 	// AppendData appends data to the node
-	AppendData(context.Context, Path, io.Reader) (ResolvedPath, error)
+	AppendData(context.Context, path.Path, io.Reader) (path.ResolvedPath, error)
 
 	// SetData sets the data contained in the node
-	SetData(context.Context, Path, io.Reader) (ResolvedPath, error)
+	SetData(context.Context, path.Path, io.Reader) (path.ResolvedPath, error)
 
 	// Diff returns a set of changes needed to transform the first object into the
 	// second.
-	Diff(context.Context, Path, Path) ([]ObjectChange, error)
+	Diff(context.Context, path.Path, path.Path) ([]ObjectChange, error)
 }