From 1e573836850aef678080d9b74e4780af612c98b6 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sun, 11 Sep 2016 05:09:43 +0200
Subject: [PATCH 001/247] coreapi: get going, add Cat() and Ls()

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@d6cc518f50f331dfd20dc79e87319f307fa2b5e7

This commit was moved from ipfs/boxo@9a989442e7cd6463a7473cf7d6ed03e823c8b38a
---
 core/coreiface/interface.go | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 core/coreiface/interface.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
new file mode 100644
index 000000000..694a116a5
--- /dev/null
+++ b/core/coreiface/interface.go
@@ -0,0 +1,56 @@
+package iface
+
+import (
+	"context"
+	"errors"
+	"io"
+
+	cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid"
+)
+
+// type CoreAPI interface {
+// 	ID() CoreID
+// 	Version() CoreVersion
+// }
+
+type Link struct {
+	Name string
+	Size uint64
+	Cid  *cid.Cid
+}
+
+type Reader interface {
+	io.ReadSeeker
+	io.Closer
+}
+
+type UnixfsAPI interface {
+	Cat(context.Context, string) (Reader, error)
+	Ls(context.Context, string) ([]*Link, error)
+}
+
+// type ObjectAPI interface {
+// 	New() (cid.Cid, Object)
+// 	Get(string) (Object, error)
+// 	Links(string) ([]*Link, error)
+// 	Data(string) (Reader, error)
+// 	Stat(string) (ObjectStat, error)
+// 	Put(Object) (cid.Cid, error)
+// 	SetData(string, Reader) (cid.Cid, error)
+// 	AppendData(string, Data) (cid.Cid, error)
+// 	AddLink(string, string, string) (cid.Cid, error)
+// 	RmLink(string, string) (cid.Cid, error)
+// }
+
+// type ObjectStat struct {
+// 	Cid            cid.Cid
+// 	NumLinks       int
+// 	BlockSize      int
+// 	LinksSize      int
+// 	DataSize       int
+// 	CumulativeSize int
+// }
+
+var ErrIsDir = errors.New("object is a directory")
+var ErrIsNonDag = errors.New("not a merkledag object")
+var ErrOffline = errors.New("can't resolve, ipfs node is offline")

From a4a55e7799c0b5814d14825650fe496d6a229ed8 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 20 Sep 2016 04:30:43 +0200
Subject: [PATCH 002/247] coreapi: add Add()

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@87e9bc0419bdabee9aa6534e53a669484ac2e706

This commit was moved from ipfs/boxo@b83c5e3fc362276e9bfa6a34848598556289bdfa
---
 core/coreiface/interface.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 694a116a5..297e8bfed 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -25,6 +25,7 @@ type Reader interface {
 }
 
 type UnixfsAPI interface {
+	Add(context.Context, io.Reader) (*cid.Cid, error)
 	Cat(context.Context, string) (Reader, error)
 	Ls(context.Context, string) ([]*Link, error)
 }

From a3fb17377b56a28ef4e2e62dd620f179cf8bb7df Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Sun, 30 Oct 2016 03:09:48 +0100
Subject: [PATCH 003/247] coreapi: reuse go-ipld-node.Link

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@c34bbcac7cbf4b4b075dac8474dad72ef4b6063b

This commit was moved from ipfs/boxo@54a9bc53742ad876e1b9705c10b50fc47d58377d
---
 core/coreiface/interface.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 297e8bfed..18328a2a0 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 
+	ipld "gx/ipfs/QmU7bFWQ793qmvNy7outdCaMfSDNk8uqhx4VNrxYj5fj5g/go-ipld-node"
 	cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid"
 )
 
@@ -13,11 +14,7 @@ import (
 // 	Version() CoreVersion
 // }
 
-type Link struct {
-	Name string
-	Size uint64
-	Cid  *cid.Cid
-}
+type Link ipld.Link
 
 type Reader interface {
 	io.ReadSeeker

From 10bf6e91714f6e4f180dd0adccc26ddebb7266fb Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Tue, 15 Nov 2016 18:00:49 -0800
Subject: [PATCH 004/247] update to newer ipld node interface with Copy and
 better Tree

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>


This commit was moved from ipfs/interface-go-ipfs-core@23f95c6d1e4016ab5a01c9339b3926fdace37198

This commit was moved from ipfs/boxo@4f28fc777233e298a426081032b35501ea5ae8eb
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 18328a2a0..c1c83fa26 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	ipld "gx/ipfs/QmU7bFWQ793qmvNy7outdCaMfSDNk8uqhx4VNrxYj5fj5g/go-ipld-node"
-	cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid"
+	ipld "gx/ipfs/QmUsVJ7AEnGyjX8YWnrwq9vmECVGwBQNAKPpgz5KSg8dcq/go-ipld-node"
+	cid "gx/ipfs/QmcEcrBAMrwMyhSjXt4yfyPpzgSuV8HLHavnfmiKCSRqZU/go-cid"
 )
 
 // type CoreAPI interface {

From 88ba95d954d28e4392c65e47de682efbed6d87b7 Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Mon, 28 Nov 2016 22:29:38 -0800
Subject: [PATCH 005/247] bubble up go-datastore deps

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>


This commit was moved from ipfs/interface-go-ipfs-core@3f68a10d21f3553c4639f477388b3b36492912a2

This commit was moved from ipfs/boxo@da6ace83a4549449f1c3f08748d0906d0bfeee37
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index c1c83fa26..cf6471947 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	ipld "gx/ipfs/QmUsVJ7AEnGyjX8YWnrwq9vmECVGwBQNAKPpgz5KSg8dcq/go-ipld-node"
-	cid "gx/ipfs/QmcEcrBAMrwMyhSjXt4yfyPpzgSuV8HLHavnfmiKCSRqZU/go-cid"
+	ipld "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
+	cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
 )
 
 // type CoreAPI interface {

From 95beda800ffd616baa7e5216dd86d0efa3dabf20 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Thu, 2 Feb 2017 20:09:02 -0800
Subject: [PATCH 006/247] update go-multihash and bubble up deps

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@c7723c40fead3509cec1fa255fc8531e8e87c744

This commit was moved from ipfs/boxo@c8a57ca4e3df2570f75832b5bebcb925ae647bce
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index cf6471947..b506e6509 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	ipld "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
-	cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
+	cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
+	ipld "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
 )
 
 // type CoreAPI interface {

From 5bce81d63e222d3ea8a7d3a2e1e4aaba6bb179bd Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 16 Nov 2016 06:21:15 +0100
Subject: [PATCH 007/247] coreapi: smarter way of dealing with the different
 APIs

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@e69000d481d335aef4d610be31750e8558f3b795

This commit was moved from ipfs/boxo@295f1305501eabc7645b7d947d823148c3b0bb56
---
 core/coreiface/interface.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index b506e6509..7bf9d5c0a 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -9,11 +9,6 @@ import (
 	ipld "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
 )
 
-// type CoreAPI interface {
-// 	ID() CoreID
-// 	Version() CoreVersion
-// }
-
 type Link ipld.Link
 
 type Reader interface {
@@ -21,6 +16,10 @@ type Reader interface {
 	io.Closer
 }
 
+type CoreAPI interface {
+	Unixfs() UnixfsAPI
+}
+
 type UnixfsAPI interface {
 	Add(context.Context, io.Reader) (*cid.Cid, error)
 	Cat(context.Context, string) (Reader, error)

From 1c53ef3f984b664538ada9d9adf27cdc4ea3c2b6 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Fri, 17 Mar 2017 03:47:59 +0100
Subject: [PATCH 008/247] coreapi: make the interfaces path centric

The new coreiface.Path maps a path to the cid.Cid
resulting from a full path resolution.

The path is internally represented as a go-ipfs/path.Path,
but that doesn't matter to the outside.

Apart from the path-to-CID mapping, it also aims to hold all
resolved segment CIDs of the path. Right now it only exposes
Root(), and only for flat paths a la /ipfs/Qmfoo. In other cases,
the root is nil.

In the future, resolution will internally use
go-ipfs/path.Resolver.ResolvePathComponents and thus always return
the proper resolved segments, via Root(), or a future Segments() func.

- Add coreiface.Path with Cid() and Root().
- Add CoreAPI.ResolvePath() for getting a coreiface.Path.
- All functions now expect and return coreiface.Path.
- Add ParsePath() and ParseCid() for constructing a coreiface.Path.
- Add coreiface.Node and Link which are simply go-ipld-node.Node and Link.
- Add CoreAPI.ResolveNode() for getting a Node from a Path.

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@66af039105d5e4ebc82a178143d8643ad3fed91d

This commit was moved from ipfs/boxo@61e07c830c0222fbd796118e7784e24ecf1c7e24
---
 core/coreiface/interface.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 7bf9d5c0a..d72fc8a3b 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -9,6 +9,16 @@ import (
 	ipld "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
 )
 
+type Path interface {
+	String() string
+	Cid() *cid.Cid
+	Root() *cid.Cid
+	Resolved() bool
+}
+
+// TODO: should we really copy these?
+//       if we didn't, godoc would generate nice links straight to go-ipld-node
+type Node ipld.Node
 type Link ipld.Link
 
 type Reader interface {
@@ -18,12 +28,14 @@ type Reader interface {
 
 type CoreAPI interface {
 	Unixfs() UnixfsAPI
+	ResolvePath(context.Context, Path) (Path, error)
+	ResolveNode(context.Context, Path) (Node, error)
 }
 
 type UnixfsAPI interface {
-	Add(context.Context, io.Reader) (*cid.Cid, error)
-	Cat(context.Context, string) (Reader, error)
-	Ls(context.Context, string) ([]*Link, error)
+	Add(context.Context, io.Reader) (Path, error)
+	Cat(context.Context, Path) (Reader, error)
+	Ls(context.Context, Path) ([]*Link, error)
 }
 
 // type ObjectAPI interface {
@@ -49,5 +61,4 @@ type UnixfsAPI interface {
 // }
 
 var ErrIsDir = errors.New("object is a directory")
-var ErrIsNonDag = errors.New("not a merkledag object")
 var ErrOffline = errors.New("can't resolve, ipfs node is offline")

From 393471674ced3be04563a5667bd5cda91f4e0bc3 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Fri, 24 Mar 2017 23:51:18 -0700
Subject: [PATCH 009/247] bubble up updates from go-multihash changes

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@be73d10538ec977bdb62976f52ac926f5eb83232

This commit was moved from ipfs/boxo@dcecd3345b8ceed091ee2e80857695e170ea5bf2
---
 core/coreiface/interface.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index d72fc8a3b..a7762c8c2 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
-	ipld "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
+	cid "gx/ipfs/QmYhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid"
+	ipld "gx/ipfs/Qmb3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format"
 )
 
 type Path interface {
@@ -17,7 +17,7 @@ type Path interface {
 }
 
 // TODO: should we really copy these?
-//       if we didn't, godoc would generate nice links straight to go-ipld-node
+//       if we didn't, godoc would generate nice links straight to go-ipld-format
 type Node ipld.Node
 type Link ipld.Link
 

From 4c057b0fc32b7ae9c834295946c507c0c03ba752 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Sun, 18 Jun 2017 13:07:24 -0700
Subject: [PATCH 010/247] blocks: gx import go-block-format

And updated related dependencies.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@477bd882b4bdd348fd7ef8f35c81f5a11a732199

This commit was moved from ipfs/boxo@8fd5b213838670d5fed83a6ca39240179ab8cf3f
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index a7762c8c2..273d8e25a 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	cid "gx/ipfs/QmYhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid"
-	ipld "gx/ipfs/Qmb3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format"
+	cid "gx/ipfs/QmNw61A6sJoXMeP37mJRtQZdNhj5e3FdjoTN3v4FyE96Gk/go-cid"
+	ipld "gx/ipfs/QmUBtPvHKFAX43XMsyxsYpMi3U5VwZ4jYFTo4kFhvAR33G/go-ipld-format"
 )
 
 type Path interface {

From 3ba2027081fb010676936fd2492a66a6bf3e22a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 4 Jul 2017 20:18:57 +0200
Subject: [PATCH 011/247] Update go-datastore to 1.2.2, go-cid to 0.7.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e706b34ea178ca535760a511e3950510e6bb1355

This commit was moved from ipfs/boxo@624057e9d94d8d44cc424dca843027b47fa25ec1
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 273d8e25a..363c5adac 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	cid "gx/ipfs/QmNw61A6sJoXMeP37mJRtQZdNhj5e3FdjoTN3v4FyE96Gk/go-cid"
-	ipld "gx/ipfs/QmUBtPvHKFAX43XMsyxsYpMi3U5VwZ4jYFTo4kFhvAR33G/go-ipld-format"
+	ipld "gx/ipfs/QmPAKbSsgEX5B6fpmxa61jXYnoWzZr5sNafd3qgPiSH8Uv/go-ipld-format"
+	cid "gx/ipfs/Qma4RJSuh7mMeJQYCqMbKzekn6EwBo7HEs5AQYjVRMQATB/go-cid"
 )
 
 type Path interface {

From a7a3a37e827000bfaa7fb0fa5d68e85748ace90c Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 11 Jul 2017 19:17:51 -0700
Subject: [PATCH 012/247] update go-multihash and bubble up changes

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ee874380410e6a909c9517ecd58730cb17b4424d

This commit was moved from ipfs/boxo@0997d0c7d5f69975acdf597e7266427e54c223b4
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 363c5adac..81197bb46 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	ipld "gx/ipfs/QmPAKbSsgEX5B6fpmxa61jXYnoWzZr5sNafd3qgPiSH8Uv/go-ipld-format"
-	cid "gx/ipfs/Qma4RJSuh7mMeJQYCqMbKzekn6EwBo7HEs5AQYjVRMQATB/go-cid"
+	cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
+	ipld "gx/ipfs/QmYNyRZJBUYPNrLszFmrBrPJbsBh2vMsefz5gnDpB5M1P6/go-ipld-format"
 )
 
 type Path interface {

From 9065eaf739718d028c3572ecd33ef9bf7a0c28bf Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 28 Aug 2017 20:32:16 -0700
Subject: [PATCH 013/247] gx: update go-cid, go-multibase, base32

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@6c6807b399ac688cbe92d85156b74cae3bd45321

This commit was moved from ipfs/boxo@d45714f3fa2fcf0224d6b0774cd729941109a450
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 81197bb46..78a64dd40 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
-	ipld "gx/ipfs/QmYNyRZJBUYPNrLszFmrBrPJbsBh2vMsefz5gnDpB5M1P6/go-ipld-format"
+	cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
+	ipld "gx/ipfs/QmPN7cwmpcc4DWXb4KTB9dNAJgjuPY69h3npsMfhRrQL9c/go-ipld-format"
 )
 
 type Path interface {

From 0826705811ed121d6044a600c72297cd0a4f3c22 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Sun, 3 Dec 2017 21:34:29 -0800
Subject: [PATCH 014/247] gx: update go-multihash

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@b5fea556bf3c13bbeed2b0fe72605f0c23b17ae3

This commit was moved from ipfs/boxo@efbab5e602175954bcef811bbbba89340ebfe687
---
 core/coreiface/interface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 78a64dd40..aef86d63a 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
-	ipld "gx/ipfs/QmPN7cwmpcc4DWXb4KTB9dNAJgjuPY69h3npsMfhRrQL9c/go-ipld-format"
+	ipld "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format"
+	cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
 )
 
 type Path interface {

From 66f305fb517f962ad64a1aa92f4702c4d2b043f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 15 Dec 2017 01:34:49 +0100
Subject: [PATCH 015/247] docs/coreapi: Add some documentation to CoreAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@2fbdcd09c87e05ff355b4a492b01029273b1f0f3

This commit was moved from ipfs/boxo@9cc221d2ae772fe67425e873db64516bf1bf1f40
---
 core/coreiface/interface.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 78a64dd40..87e9fcd0f 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -1,3 +1,5 @@
+// Package iface defines IPFS Core API which is a set of interfaces used to
+// interact with IPFS nodes.
 package iface
 
 import (
@@ -9,6 +11,8 @@ import (
 	ipld "gx/ipfs/QmPN7cwmpcc4DWXb4KTB9dNAJgjuPY69h3npsMfhRrQL9c/go-ipld-format"
 )
 
+// Path is a generic wrapper for paths used in the API. A path can be resolved
+// to a CID using one of Resolve functions in the API.
 type Path interface {
 	String() string
 	Cid() *cid.Cid
@@ -26,15 +30,28 @@ type Reader interface {
 	io.Closer
 }
 
+// CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
+	// Unixfs returns an implementation of Unixfs API
 	Unixfs() UnixfsAPI
+
+	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (Path, error)
+
+	// ResolveNode resolves the path (if not resolved already) using Unixfs
+	// resolver, gets and returns the resolved Node
 	ResolveNode(context.Context, Path) (Node, error)
 }
 
+// UnixfsAPI is the basic interface to immutable files in IPFS
 type UnixfsAPI interface {
+	// Add imports the data from the reader into merkledag file
 	Add(context.Context, io.Reader) (Path, error)
+
+	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)
+
+	// Ls returns the list of links in a directory
 	Ls(context.Context, Path) ([]*Link, error)
 }
 

From 3051f3b60123d981b25e88dd45651064ac9a8511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 8 Dec 2017 22:51:35 +0100
Subject: [PATCH 016/247] coreapi: DAG API proposal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@c6015845cbf43a2b9fc83d749137bee10f9d6396

This commit was moved from ipfs/boxo@b351a5a73c7db7a1dbbbffe546f76563c91c2fa5
---
 core/coreiface/interface.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index b753c4184..508588a04 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -34,13 +34,14 @@ type Reader interface {
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API
 	Unixfs() UnixfsAPI
+	Dag() DagAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (Path, error)
 
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
-	ResolveNode(context.Context, Path) (Node, error)
+	ResolveNode(context.Context, Path) (Node, error) //TODO: should this get dropped in favor of DagAPI.Get?
 }
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
@@ -55,6 +56,12 @@ type UnixfsAPI interface {
 	Ls(context.Context, Path) ([]*Link, error)
 }
 
+type DagAPI interface {
+	Put(ctx context.Context, src io.Reader, inputEnc string, format *cid.Prefix) ([]Node, error)
+	Get(ctx context.Context, path Path) (Node, error)
+	Tree(ctx context.Context, path Path, depth int) ([]Path, error)
+}
+
 // type ObjectAPI interface {
 // 	New() (cid.Cid, Object)
 // 	Get(string) (Object, error)

From 363c556e23c5ae12c40fda53fac95500f295f1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 11 Dec 2017 17:22:21 +0100
Subject: [PATCH 017/247] coreapi: add tests for dag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@c593c49d857c407d9e3b6a5576f2cdb5a1fe1e97

This commit was moved from ipfs/boxo@b0b4e68ff7103e39dd2698db9877b96978bc3ec4
---
 core/coreiface/interface.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 508588a04..ecccc1c64 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -41,7 +41,7 @@ type CoreAPI interface {
 
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
-	ResolveNode(context.Context, Path) (Node, error) //TODO: should this get dropped in favor of DagAPI.Get?
+	ResolveNode(context.Context, Path) (Node, error)
 }
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
@@ -56,9 +56,17 @@ type UnixfsAPI interface {
 	Ls(context.Context, Path) ([]*Link, error)
 }
 
+// DagAPI specifies the interface to IPLD
 type DagAPI interface {
-	Put(ctx context.Context, src io.Reader, inputEnc string, format *cid.Prefix) ([]Node, error)
+	// Put inserts data using specified format and input encoding.
+	// If format is not specified (nil), default dag-cbor/sha256 is used
+	Put(ctx context.Context, src io.Reader, inputEnc string, format *cid.Prefix) ([]Node, error) //TODO: make format optional
+
+	// Get attempts to resolve and get the node specified by the path
 	Get(ctx context.Context, path Path) (Node, error)
+
+	// Tree returns list of paths within a node specified by the path.
+	// To get all paths in a tree, set depth to -1
 	Tree(ctx context.Context, path Path, depth int) ([]Path, error)
 }
 

From e6a16b57e63b33e1d8ed7f2edb079e1c96527873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 17 Dec 2017 03:23:50 +0100
Subject: [PATCH 018/247] coreapi: functional options for DagAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@39f8afada852b5189996725ccde10b6d64f1b5ab

This commit was moved from ipfs/boxo@9901857d2d284da55025a64aacf72d6ac9c89b1f
---
 core/coreiface/interface.go   | 25 +++++++++--
 core/coreiface/options/dag.go | 83 +++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 core/coreiface/options/dag.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index ecccc1c64..f43700e9c 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -7,6 +7,8 @@ import (
 	"errors"
 	"io"
 
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
 	ipld "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format"
 	cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
 )
@@ -60,14 +62,31 @@ type UnixfsAPI interface {
 type DagAPI interface {
 	// Put inserts data using specified format and input encoding.
 	// If format is not specified (nil), default dag-cbor/sha256 is used
-	Put(ctx context.Context, src io.Reader, inputEnc string, format *cid.Prefix) ([]Node, error) //TODO: make format optional
+	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) ([]Node, error)
+
+	// WithInputEnc is an option for Put which specifies the input encoding of the
+	// data. Default is "json", most formats/codecs support "raw"
+	WithInputEnc(enc string) options.DagPutOption
+
+	// WithCodec is an option for Put which specifies the multicodec to use to
+	// serialize the object. Default is cid.DagCBOR (0x71)
+	WithCodec(codec uint64) options.DagPutOption
+
+	// WithHash is an option for Put which specifies the multihash settings to use
+	// when hashing the object. Default is based on the codec used
+	// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
+	// the hash will be used
+	WithHash(mhType uint64, mhLen int) options.DagPutOption
 
 	// Get attempts to resolve and get the node specified by the path
 	Get(ctx context.Context, path Path) (Node, error)
 
 	// Tree returns list of paths within a node specified by the path.
-	// To get all paths in a tree, set depth to -1
-	Tree(ctx context.Context, path Path, depth int) ([]Path, error)
+	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
+
+	// WithDepth is an option for Tree which specifies maximum depth of the
+	// returned tree. Default is -1 (no depth limit)
+	WithDepth(depth int) options.DagTreeOption
 }
 
 // type ObjectAPI interface {
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
new file mode 100644
index 000000000..7850c4bc3
--- /dev/null
+++ b/core/coreiface/options/dag.go
@@ -0,0 +1,83 @@
+package options
+
+import (
+	"math"
+
+	cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
+)
+
+type DagPutSettings struct {
+	InputEnc string
+	Codec    uint64
+	MhType   uint64
+	MhLength int
+}
+
+type DagTreeSettings struct {
+	Depth int
+}
+
+type DagPutOption func(*DagPutSettings) error
+type DagTreeOption func(*DagTreeSettings) error
+
+func DagPutOptions(opts ...DagPutOption) (*DagPutSettings, error) {
+	options := &DagPutSettings{
+		InputEnc: "json",
+		Codec:    cid.DagCBOR,
+		MhType:   math.MaxUint64,
+		MhLength: -1,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func DagTreeOptions(opts ...DagTreeOption) (*DagTreeSettings, error) {
+	options := &DagTreeSettings{
+		Depth: -1,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type DagOptions struct{}
+
+func (api *DagOptions) WithInputEnc(enc string) DagPutOption {
+	return func(settings *DagPutSettings) error {
+		settings.InputEnc = enc
+		return nil
+	}
+}
+
+func (api *DagOptions) WithCodec(codec uint64) DagPutOption {
+	return func(settings *DagPutSettings) error {
+		settings.Codec = codec
+		return nil
+	}
+}
+
+func (api *DagOptions) WithHash(mhType uint64, mhLen int) DagPutOption {
+	return func(settings *DagPutSettings) error {
+		settings.MhType = mhType
+		settings.MhLength = mhLen
+		return nil
+	}
+}
+
+func (api *DagOptions) WithDepth(depth int) DagTreeOption {
+	return func(settings *DagTreeSettings) error {
+		settings.Depth = depth
+		return nil
+	}
+}

From e68b73b54ed06fc8b078bc4866efe1653f6dae4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 21 Dec 2017 01:56:41 +0100
Subject: [PATCH 019/247] coreapi: dag review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@20fa7a599e839af20bef873f12fcc2f94fd0c529

This commit was moved from ipfs/boxo@bae5f5303ec03d6399c3345ba6c14397812b1ead
---
 core/coreiface/interface.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index f43700e9c..e51888e60 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -61,8 +61,9 @@ type UnixfsAPI interface {
 // DagAPI specifies the interface to IPLD
 type DagAPI interface {
 	// Put inserts data using specified format and input encoding.
-	// If format is not specified (nil), default dag-cbor/sha256 is used
-	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) ([]Node, error)
+	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
+	// "sha256" are used.
+	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (Path, error)
 
 	// WithInputEnc is an option for Put which specifies the input encoding of the
 	// data. Default is "json", most formats/codecs support "raw"

From 71593fb48cd8b6b4bc7590d7b1cfa8b662ef611d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 10 Dec 2017 23:15:37 +0100
Subject: [PATCH 020/247] coreapi: Name API proposal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1b5e997ca845b58519a3592db60c78d4ec7efdc8

This commit was moved from ipfs/boxo@8972ab9e110214d72b9c048240ac75e33bd69248
---
 core/coreiface/interface.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index e51888e60..3fcf7374e 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"errors"
 	"io"
+	"time"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
@@ -27,6 +28,11 @@ type Path interface {
 type Node ipld.Node
 type Link ipld.Link
 
+type IpnsEntry struct {
+	Name  string
+	Value Path
+}
+
 type Reader interface {
 	io.ReadSeeker
 	io.Closer
@@ -37,6 +43,7 @@ type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API
 	Unixfs() UnixfsAPI
 	Dag() DagAPI
+	Name() NameAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (Path, error)
@@ -90,6 +97,18 @@ type DagAPI interface {
 	WithDepth(depth int) options.DagTreeOption
 }
 
+type NameAPI interface {
+	Publish(ctx context.Context, path Path, validTime time.Duration, key string) (*IpnsEntry, error)
+	Resolve(ctx context.Context, name string, recursive bool, local bool, nocache bool) (Path, error)
+}
+
+type KeyApi interface {
+	Generate(ctx context.Context, name string, algorithm string, size int) error
+	List(ctx context.Context) (map[string]string, error) //TODO: better key type?
+	Rename(ctx context.Context, oldName string, newName string) error
+	Remove(ctx context.Context, name string) error
+}
+
 // type ObjectAPI interface {
 // 	New() (cid.Cid, Object)
 // 	Get(string) (Object, error)

From cb3c588799f563e5597d3855ccff3a10b915c13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 10 Dec 2017 23:48:16 +0100
Subject: [PATCH 021/247] coreapi: Keystore API proposal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@4fbdf56dc24b8b7357c0eb06c223093c506c1bbc

This commit was moved from ipfs/boxo@286e418f6c66494631d6b570b1ec86396c13e2f0
---
 core/coreiface/interface.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 3fcf7374e..f6412d68f 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -44,6 +44,7 @@ type CoreAPI interface {
 	Unixfs() UnixfsAPI
 	Dag() DagAPI
 	Name() NameAPI
+	Key() KeyAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (Path, error)
@@ -102,11 +103,11 @@ type NameAPI interface {
 	Resolve(ctx context.Context, name string, recursive bool, local bool, nocache bool) (Path, error)
 }
 
-type KeyApi interface {
-	Generate(ctx context.Context, name string, algorithm string, size int) error
+type KeyAPI interface {
+	Generate(ctx context.Context, name string, algorithm string, size int) (string, error)
 	List(ctx context.Context) (map[string]string, error) //TODO: better key type?
-	Rename(ctx context.Context, oldName string, newName string) error
-	Remove(ctx context.Context, name string) error
+	Rename(ctx context.Context, oldName string, newName string, force bool) (string, bool, error)
+	Remove(ctx context.Context, name string) (string, error)
 }
 
 // type ObjectAPI interface {

From d52ea2fe1ae543d162b8bb03dab2ab3c7f18d8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 13 Dec 2017 19:05:23 +0100
Subject: [PATCH 022/247] coreapi: name/key functional options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@7a786c5509ec924e3cfe2c29b42f76c47ccecbc4

This commit was moved from ipfs/boxo@c02dc49770c2cbbb89c695c8e83bfc1276c6d665
---
 core/coreiface/interface.go    | 19 ++++++--
 core/coreiface/options/key.go  | 65 +++++++++++++++++++++++++
 core/coreiface/options/name.go | 89 ++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+), 4 deletions(-)
 create mode 100644 core/coreiface/options/key.go
 create mode 100644 core/coreiface/options/name.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index f6412d68f..36bd801a1 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -99,14 +99,25 @@ type DagAPI interface {
 }
 
 type NameAPI interface {
-	Publish(ctx context.Context, path Path, validTime time.Duration, key string) (*IpnsEntry, error)
-	Resolve(ctx context.Context, name string, recursive bool, local bool, nocache bool) (Path, error)
+	Publish(ctx context.Context, path Path, opts ...options.NamePublishOption) (*IpnsEntry, error)
+	WithValidTime(validTime time.Duration) options.NamePublishOption
+	WithKey(key string) options.NamePublishOption
+
+	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
+	WithRecursive(recursive bool) options.NameResolveOption
+	WithLocal(local bool) options.NameResolveOption
+	WithNoCache(nocache bool) options.NameResolveOption
 }
 
 type KeyAPI interface {
-	Generate(ctx context.Context, name string, algorithm string, size int) (string, error)
+	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (string, error)
+	WithAlgorithm(algorithm string) options.KeyGenerateOption
+	WithSize(size int) options.KeyGenerateOption
+
+	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (string, bool, error)
+	WithForce(force bool) options.KeyRenameOption
+
 	List(ctx context.Context) (map[string]string, error) //TODO: better key type?
-	Rename(ctx context.Context, oldName string, newName string, force bool) (string, bool, error)
 	Remove(ctx context.Context, name string) (string, error)
 }
 
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
new file mode 100644
index 000000000..5ed7b408f
--- /dev/null
+++ b/core/coreiface/options/key.go
@@ -0,0 +1,65 @@
+package options
+
+type KeyGenerateSettings struct {
+	Algorithm string
+	Size      int
+}
+
+type KeyRenameSettings struct {
+	Force bool
+}
+
+type KeyGenerateOption func(*KeyGenerateSettings) error
+type KeyRenameOption func(*KeyRenameSettings) error
+
+func KeyGenerateOptions(opts ...KeyGenerateOption) (*KeyGenerateSettings, error) {
+	options := &KeyGenerateSettings{
+		Algorithm: "rsa",
+		Size:      0,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func KeyRenameOptions(opts ...KeyRenameOption) (*KeyRenameSettings, error) {
+	options := &KeyRenameSettings{
+		Force: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type KeyOptions struct{}
+
+func (api *KeyOptions) WithAlgorithm(algorithm string) KeyGenerateOption {
+	return func(settings *KeyGenerateSettings) error {
+		settings.Algorithm = algorithm
+		return nil
+	}
+}
+
+func (api *KeyOptions) WithSize(size int) KeyGenerateOption {
+	return func(settings *KeyGenerateSettings) error {
+		settings.Size = size
+		return nil
+	}
+}
+
+func (api *KeyOptions) WithForce(force bool) KeyRenameOption {
+	return func(settings *KeyRenameSettings) error {
+		settings.Force = force
+		return nil
+	}
+}
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
new file mode 100644
index 000000000..aa2129162
--- /dev/null
+++ b/core/coreiface/options/name.go
@@ -0,0 +1,89 @@
+package options
+
+import (
+	"time"
+)
+
+type NamePublishSettings struct {
+	ValidTime time.Duration
+	Key       string
+}
+
+type NameResolveSettings struct {
+	Recursive bool
+	Local     bool
+	Nocache   bool
+}
+
+type NamePublishOption func(*NamePublishSettings) error
+type NameResolveOption func(*NameResolveSettings) error
+
+func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error) {
+	options := &NamePublishSettings{
+		ValidTime: 24 * time.Hour,
+		Key:       "self",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error) {
+	options := &NameResolveSettings{
+		Recursive: false,
+		Local:     false,
+		Nocache:   false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+type NameOptions struct{}
+
+func (api *NameOptions) WithValidTime(validTime time.Duration) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.ValidTime = validTime
+		return nil
+	}
+}
+
+func (api *NameOptions) WithKey(key string) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.Key = key
+		return nil
+	}
+}
+
+func (api *NameOptions) WithRecursive(recursive bool) NameResolveOption {
+	return func(settings *NameResolveSettings) error {
+		settings.Recursive = recursive
+		return nil
+	}
+}
+
+func (api *NameOptions) WithLocal(local bool) NameResolveOption {
+	return func(settings *NameResolveSettings) error {
+		settings.Local = local
+		return nil
+	}
+}
+
+func (api *NameOptions) WithNoCache(nocache bool) NameResolveOption {
+	return func(settings *NameResolveSettings) error {
+		settings.Nocache = nocache
+		return nil
+	}
+}

From b92cca8429acecf498e37fd438df15a323e4c246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 15 Dec 2017 01:03:53 +0100
Subject: [PATCH 023/247] coreapi: Documentation for Name/Key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@74695ab9b4f2efc64b6a88fcd900fbd67a63b416

This commit was moved from ipfs/boxo@d733fa263ca5d8340684f8c062ef474000f54fe7
---
 core/coreiface/interface.go | 47 +++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 36bd801a1..a861e4700 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -98,26 +98,73 @@ type DagAPI interface {
 	WithDepth(depth int) options.DagTreeOption
 }
 
+// NameAPI specifies the interface to IPNS.
+//
+// IPNS is a PKI namespace, where names are the hashes of public keys, and the
+// private key enables publishing new (signed) values. In both publish and
+// resolve, the default name used is the node's own PeerID, which is the hash of
+// its public key.
+//
+// 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)
+
+	// WithValidTime is an option for Publish which specifies for how long the
+	// entry will remain valid. Default value is 24h
 	WithValidTime(validTime time.Duration) options.NamePublishOption
+
+	// WithKey is an option for Publish which specifies the key to use for
+	// publishing. Default value is "self" which is the node's own PeerID.
+	//
+	// You can use .Key API to list and generate more names and their respective keys.
 	WithKey(key string) options.NamePublishOption
 
+	// Resolve attempts to resolve the newest version of the specified name
 	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
+
+	// WithRecursive is an option for Resolve which specifies whether to perform a
+	// recursive lookup. Default value is false
 	WithRecursive(recursive bool) options.NameResolveOption
+
+	// WithLocal is an option for Resolve which specifies if the lookup should be
+	// offline. Default value is false
 	WithLocal(local bool) options.NameResolveOption
+
+	// WithNoCache is an option for Resolve which specifies when set to true
+	// disables the use of local name cache. Default value is false
 	WithNoCache(nocache bool) options.NameResolveOption
 }
 
+// KeyAPI specifies the interface to Keystore
 type KeyAPI interface {
+	// Generate generates new key, stores it in the keystore under the specified
+	// name and returns a base58 encoded multihash of it's public key
 	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (string, error)
+
+	// WithAlgorithm is an option for Generate which specifies which algorithm
+	// should be used for the key. Default is "rsa"
+	//
+	// Supported algorithms:
+	// * rsa
+	// * ed25519
 	WithAlgorithm(algorithm string) options.KeyGenerateOption
+
+	// WithSize is an option for Generate which specifies the size of the key to
+	// generated. Default is 0
 	WithSize(size int) options.KeyGenerateOption
 
+	// Rename renames oldName key to newName.
 	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (string, bool, error)
+
+	// WithForce is an option for Rename which specifies whether to allow to
+	// replace existing keys.
 	WithForce(force bool) options.KeyRenameOption
 
+	// List lists keys stored in keystore
 	List(ctx context.Context) (map[string]string, error) //TODO: better key type?
+
+	// Remove removes keys from keystore
 	Remove(ctx context.Context, name string) (string, error)
 }
 

From 1caf71766f81e4c950ed4d527b4c5933cdd53726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 17 Dec 2017 03:44:13 +0100
Subject: [PATCH 024/247] coreapi: name/key review suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8f7e0241ec5a85f3acaf3152107bd9ad202f56a8

This commit was moved from ipfs/boxo@d0730a47d3a8d4e4be5cc9d1886b8b5a32816267
---
 core/coreiface/interface.go    | 45 ++++++++++++++++++++--------------
 core/coreiface/options/key.go  |  7 +++++-
 core/coreiface/options/name.go | 14 +++++++----
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index a861e4700..0086bd0d6 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -28,16 +28,21 @@ type Path interface {
 type Node ipld.Node
 type Link ipld.Link
 
-type IpnsEntry struct {
-	Name  string
-	Value Path
-}
-
 type Reader interface {
 	io.ReadSeeker
 	io.Closer
 }
 
+type IpnsEntry interface {
+	Name() string
+	Value() Path
+}
+
+type Key interface {
+	Name() string
+	Path() Path
+}
+
 // CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API
@@ -108,7 +113,7 @@ type DagAPI interface {
 // 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, opts ...options.NamePublishOption) (IpnsEntry, error)
 
 	// WithValidTime is an option for Publish which specifies for how long the
 	// entry will remain valid. Default value is 24h
@@ -116,8 +121,9 @@ type NameAPI interface {
 
 	// WithKey is an option for Publish which specifies the key to use for
 	// publishing. Default value is "self" which is the node's own PeerID.
+	// The key parameter must be either PeerID or keystore key alias.
 	//
-	// You can use .Key API to list and generate more names and their respective keys.
+	// You can use KeyAPI to list and generate more names and their respective keys.
 	WithKey(key string) options.NamePublishOption
 
 	// Resolve attempts to resolve the newest version of the specified name
@@ -131,41 +137,42 @@ type NameAPI interface {
 	// offline. Default value is false
 	WithLocal(local bool) options.NameResolveOption
 
-	// WithNoCache is an option for Resolve which specifies when set to true
-	// disables the use of local name cache. Default value is false
-	WithNoCache(nocache bool) options.NameResolveOption
+	// WithCache is an option for Resolve which specifies if cache should be used.
+	// Default value is true
+	WithCache(cache bool) options.NameResolveOption
 }
 
 // KeyAPI specifies the interface to Keystore
 type KeyAPI interface {
 	// Generate generates new key, stores it in the keystore under the specified
 	// name and returns a base58 encoded multihash of it's public key
-	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (string, error)
+	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (Key, error)
 
 	// WithAlgorithm is an option for Generate which specifies which algorithm
-	// should be used for the key. Default is "rsa"
+	// should be used for the key. Default is options.RSAKey
 	//
 	// Supported algorithms:
-	// * rsa
-	// * ed25519
+	// * options.RSAKey
+	// * options.Ed25519Key
 	WithAlgorithm(algorithm string) options.KeyGenerateOption
 
 	// WithSize is an option for Generate which specifies the size of the key to
 	// generated. Default is 0
 	WithSize(size int) options.KeyGenerateOption
 
-	// Rename renames oldName key to newName.
-	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (string, bool, error)
+	// Rename renames oldName key to newName. Returns the key and whether another
+	// key was overwritten, or an error
+	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (Key, bool, error)
 
 	// WithForce is an option for Rename which specifies whether to allow to
 	// replace existing keys.
 	WithForce(force bool) options.KeyRenameOption
 
 	// List lists keys stored in keystore
-	List(ctx context.Context) (map[string]string, error) //TODO: better key type?
+	List(ctx context.Context) ([]Key, error)
 
-	// Remove removes keys from keystore
-	Remove(ctx context.Context, name string) (string, error)
+	// Remove removes keys from keystore. Returns ipns path of the removed key
+	Remove(ctx context.Context, name string) (Path, error)
 }
 
 // type ObjectAPI interface {
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index 5ed7b408f..c84f0f8f8 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -1,5 +1,10 @@
 package options
 
+const (
+	RSAKey     = "rsa"
+	Ed25519Key = "ed25519"
+)
+
 type KeyGenerateSettings struct {
 	Algorithm string
 	Size      int
@@ -14,7 +19,7 @@ type KeyRenameOption func(*KeyRenameSettings) error
 
 func KeyGenerateOptions(opts ...KeyGenerateOption) (*KeyGenerateSettings, error) {
 	options := &KeyGenerateSettings{
-		Algorithm: "rsa",
+		Algorithm: RSAKey,
 		Size:      0,
 	}
 
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index aa2129162..9f8aaafc8 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -4,6 +4,10 @@ import (
 	"time"
 )
 
+const (
+	DefaultNameValidTime = 24 * time.Hour
+)
+
 type NamePublishSettings struct {
 	ValidTime time.Duration
 	Key       string
@@ -12,7 +16,7 @@ type NamePublishSettings struct {
 type NameResolveSettings struct {
 	Recursive bool
 	Local     bool
-	Nocache   bool
+	Cache     bool
 }
 
 type NamePublishOption func(*NamePublishSettings) error
@@ -20,7 +24,7 @@ type NameResolveOption func(*NameResolveSettings) error
 
 func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error) {
 	options := &NamePublishSettings{
-		ValidTime: 24 * time.Hour,
+		ValidTime: DefaultNameValidTime,
 		Key:       "self",
 	}
 
@@ -38,7 +42,7 @@ func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error)
 	options := &NameResolveSettings{
 		Recursive: false,
 		Local:     false,
-		Nocache:   false,
+		Cache:     true,
 	}
 
 	for _, opt := range opts {
@@ -81,9 +85,9 @@ func (api *NameOptions) WithLocal(local bool) NameResolveOption {
 	}
 }
 
-func (api *NameOptions) WithNoCache(nocache bool) NameResolveOption {
+func (api *NameOptions) WithCache(cache bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
-		settings.Nocache = nocache
+		settings.Cache = cache
 		return nil
 	}
 }

From 89776d9be77cc98652446551a29bcce5b4aba89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 1 Jan 2018 18:59:07 +0100
Subject: [PATCH 025/247] coreapi: key tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ed5f040416bbc6a72008cf3c9f299c47da6f42f1

This commit was moved from ipfs/boxo@6527d6e06318ce93a01a40d769225f9ad4fce6b2
---
 core/coreiface/interface.go   | 6 +++---
 core/coreiface/options/key.go | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 0086bd0d6..dc8365669 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -148,13 +148,13 @@ type KeyAPI interface {
 	// name and returns a base58 encoded multihash of it's public key
 	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (Key, error)
 
-	// WithAlgorithm is an option for Generate which specifies which algorithm
+	// WithType is an option for Generate which specifies which algorithm
 	// should be used for the key. Default is options.RSAKey
 	//
-	// Supported algorithms:
+	// Supported key types:
 	// * options.RSAKey
 	// * options.Ed25519Key
-	WithAlgorithm(algorithm string) options.KeyGenerateOption
+	WithType(algorithm string) options.KeyGenerateOption
 
 	// WithSize is an option for Generate which specifies the size of the key to
 	// generated. Default is 0
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index c84f0f8f8..114361875 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -3,6 +3,8 @@ package options
 const (
 	RSAKey     = "rsa"
 	Ed25519Key = "ed25519"
+
+	DefaultRSALen = 2048
 )
 
 type KeyGenerateSettings struct {
@@ -20,7 +22,7 @@ type KeyRenameOption func(*KeyRenameSettings) error
 func KeyGenerateOptions(opts ...KeyGenerateOption) (*KeyGenerateSettings, error) {
 	options := &KeyGenerateSettings{
 		Algorithm: RSAKey,
-		Size:      0,
+		Size:      -1,
 	}
 
 	for _, opt := range opts {
@@ -48,7 +50,7 @@ func KeyRenameOptions(opts ...KeyRenameOption) (*KeyRenameSettings, error) {
 
 type KeyOptions struct{}
 
-func (api *KeyOptions) WithAlgorithm(algorithm string) KeyGenerateOption {
+func (api *KeyOptions) WithType(algorithm string) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Algorithm = algorithm
 		return nil

From ef926cb0e353d66321a5bc364c53b9adc2b7800b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Jan 2018 00:53:48 +0100
Subject: [PATCH 026/247] coreapi: Name tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d28b9301ac2ca1a9e209680ba5bb613f19cbb6fe

This commit was moved from ipfs/boxo@78823e7ccbdc16b651c269f86e4cf5915144250a
---
 core/coreiface/interface.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index dc8365669..cdbb2508b 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -157,7 +157,10 @@ type KeyAPI interface {
 	WithType(algorithm string) options.KeyGenerateOption
 
 	// WithSize is an option for Generate which specifies the size of the key to
-	// generated. Default is 0
+	// generated. Default is -1
+	//
+	// value of -1 means 'use default size for key type':
+	//  * 2048 for RSA
 	WithSize(size int) options.KeyGenerateOption
 
 	// Rename renames oldName key to newName. Returns the key and whether another

From 4124018bc2dbec4efc870ce6046e941bc8987fc3 Mon Sep 17 00:00:00 2001
From: ForrestWeston <forrest@protocol.ai>
Date: Mon, 22 Jan 2018 14:44:46 -0800
Subject: [PATCH 027/247] interface docs for coreapi interface

License: MIT
Signed-off-by: ForrestWeston <forrest@protocol.ai>


This commit was moved from ipfs/interface-go-ipfs-core@2c3137f0557f44ca23730ff134b38b9426731e56

This commit was moved from ipfs/boxo@4d4c3dc176859461010b576f9af66919f34aaed3
---
 core/coreiface/interface.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index cdbb2508b..720f935e2 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -17,9 +17,13 @@ import (
 // Path is a generic wrapper for paths used in the API. A path can be resolved
 // to a CID using one of Resolve functions in the API.
 type Path interface {
+	// String returns the path as a string.
 	String() string
+	// Cid returns cid referred to by path
 	Cid() *cid.Cid
+	// Root returns cid of root path
 	Root() *cid.Cid
+	// Resolved returns whether path has been fully resolved
 	Resolved() bool
 }
 
@@ -33,22 +37,31 @@ type Reader interface {
 	io.Closer
 }
 
+// IpnsEntry specifies the interface to IpnsEntries
 type IpnsEntry interface {
+	// Name returns IpnsEntry name
 	Name() string
+	// Value returns IpnsEntry value
 	Value() Path
 }
 
+// Key specifies the interface to Keys in KeyAPI Keystore
 type Key interface {
+	// Key returns key name
 	Name() string
+	// Path returns key path
 	Path() Path
 }
 
 // CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
-	// Unixfs returns an implementation of Unixfs API
+	// Unixfs returns an implementation of Unixfs API.
 	Unixfs() UnixfsAPI
+	// Dag returns an implementation of Dag API.
 	Dag() DagAPI
+	// Name returns an implementation of Name API.
 	Name() NameAPI
+	// Key returns an implementation of Key API.
 	Key() KeyAPI
 
 	// ResolvePath resolves the path using Unixfs resolver

From 4727b6e77612b3a2534f77853c113856be0a1842 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 24 Jan 2018 15:55:28 -0800
Subject: [PATCH 028/247] gx: mass update

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@318e958cdd426798e644612d76dc294463975f71

This commit was moved from ipfs/boxo@5e7d211f6eb13d87e9a47729d28beb2a4250aa14
---
 core/coreiface/interface.go   | 4 ++--
 core/coreiface/options/dag.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 720f935e2..6e00d51ab 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -10,8 +10,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format"
-	cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
+	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
+	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
 )
 
 // Path is a generic wrapper for paths used in the API. A path can be resolved
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index 7850c4bc3..b56fcd81a 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
+	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
 )
 
 type DagPutSettings struct {

From 9f5914daf7841d111ce090c3214a39035e653261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 14 Dec 2017 23:55:24 +0100
Subject: [PATCH 029/247] coreapi: Basic object API implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@52f5b7ce1f8cc0503ec9d9ce070afdee7997049c

This commit was moved from ipfs/boxo@f10a09d9b25f8ec1a43f7e93f9fe182ca5ef82ff
---
 core/coreiface/interface.go | 42 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 720f935e2..2c31d01b1 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -191,27 +191,29 @@ type KeyAPI interface {
 	Remove(ctx context.Context, name string) (Path, error)
 }
 
-// type ObjectAPI interface {
-// 	New() (cid.Cid, Object)
-// 	Get(string) (Object, error)
-// 	Links(string) ([]*Link, error)
-// 	Data(string) (Reader, error)
-// 	Stat(string) (ObjectStat, error)
-// 	Put(Object) (cid.Cid, error)
-// 	SetData(string, Reader) (cid.Cid, error)
-// 	AppendData(string, Data) (cid.Cid, error)
-// 	AddLink(string, string, string) (cid.Cid, error)
-// 	RmLink(string, string) (cid.Cid, error)
-// }
+//TODO: Should this use paths instead of cids?
+type ObjectAPI interface {
+	New(ctx context.Context) (Node, error)
+	Put(context.Context, Node) error
+	Get(context.Context, Path) (Node, error)
+	Data(context.Context, Path) (io.Reader, error)
+	Links(context.Context, Path) ([]*Link, error)
+	Stat(context.Context, Path) (*ObjectStat, error)
 
-// type ObjectStat struct {
-// 	Cid            cid.Cid
-// 	NumLinks       int
-// 	BlockSize      int
-// 	LinksSize      int
-// 	DataSize       int
-// 	CumulativeSize int
-// }
+	AddLink(ctx context.Context, base Path, name string, child Path, create bool) (Node, error) //TODO: make create optional
+	RmLink(context.Context, Path, string) (Node, error)
+	AppendData(context.Context, Path, io.Reader) (Node, error)
+	SetData(context.Context, Path, io.Reader) (Node, error)
+}
+
+type ObjectStat struct {
+	Cid            *cid.Cid
+	NumLinks       int
+	BlockSize      int
+	LinksSize      int
+	DataSize       int
+	CumulativeSize int
+}
 
 var ErrIsDir = errors.New("object is a directory")
 var ErrOffline = errors.New("can't resolve, ipfs node is offline")

From b031da2463b9041ca7d09064746067a69b8ae7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 22 Dec 2017 17:22:53 +0100
Subject: [PATCH 030/247] coreapi: Object api review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3b4b26deb1bc75aefe85df809afca5e3e09f71c6

This commit was moved from ipfs/boxo@85688ca1e91bcfa3cc7441142e5391b760b2b43c
---
 core/coreiface/interface.go      | 10 ++++--
 core/coreiface/options/object.go | 56 ++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 core/coreiface/options/object.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 2c31d01b1..db993a5c3 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -193,14 +193,18 @@ type KeyAPI interface {
 
 //TODO: Should this use paths instead of cids?
 type ObjectAPI interface {
-	New(ctx context.Context) (Node, error)
-	Put(context.Context, Node) error
+	New(context.Context, ...options.ObjectNewOption) (Node, error)
+	WithType(string) options.ObjectNewOption
+
+	Put(context.Context, Node) (Path, error)
 	Get(context.Context, Path) (Node, error)
 	Data(context.Context, Path) (io.Reader, error)
 	Links(context.Context, Path) ([]*Link, error)
 	Stat(context.Context, Path) (*ObjectStat, error)
 
-	AddLink(ctx context.Context, base Path, name string, child Path, create bool) (Node, error) //TODO: make create optional
+	AddLink(ctx context.Context, base Path, name string, child Path, opts ...options.ObjectAddLinkOption) (Node, error)
+	WithCreate(create bool) options.ObjectAddLinkOption
+
 	RmLink(context.Context, Path, string) (Node, error)
 	AppendData(context.Context, Path, io.Reader) (Node, error)
 	SetData(context.Context, Path, io.Reader) (Node, error)
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
new file mode 100644
index 000000000..6a144ab2b
--- /dev/null
+++ b/core/coreiface/options/object.go
@@ -0,0 +1,56 @@
+package options
+
+type ObjectNewSettings struct {
+	Type string
+}
+
+type ObjectAddLinkSettings struct {
+	Create bool
+}
+
+type ObjectNewOption func(*ObjectNewSettings) error
+type ObjectAddLinkOption func(*ObjectAddLinkSettings) error
+
+func ObjectNewOptions(opts ...ObjectNewOption) (*ObjectNewSettings, error) {
+	options := &ObjectNewSettings{
+		Type: "empty",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func ObjectAddLinkOptions(opts ...ObjectAddLinkOption) (*ObjectAddLinkSettings, error) {
+	options := &ObjectAddLinkSettings{
+		Create: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type ObjectOptions struct{}
+
+func (api *ObjectOptions) WithType(t string) ObjectNewOption {
+	return func(settings *ObjectNewSettings) error {
+		settings.Type = t
+		return nil
+	}
+}
+
+func (api *ObjectOptions) WithCreate(create bool) ObjectAddLinkOption {
+	return func(settings *ObjectAddLinkSettings) error {
+		settings.Create = create
+		return nil
+	}
+}

From a806b175fa13ec957955c7678a8165d6c1ef25fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Jan 2018 21:22:20 +0100
Subject: [PATCH 031/247] coreapi: object docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@55c56578038a9e748aa996f7f9cb7dc1b546f1ac

This commit was moved from ipfs/boxo@36545a88bcc2f636493de49939e8105d7fd1977c
---
 core/coreiface/interface.go | 55 ++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index db993a5c3..7809c8b99 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -191,31 +191,72 @@ type KeyAPI interface {
 	Remove(ctx context.Context, name string) (Path, error)
 }
 
-//TODO: Should this use paths instead of cids?
+// ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
+// for manipulating MerkleDAG data structures.
 type ObjectAPI interface {
+	// New creates new, empty (by default) dag-node.
 	New(context.Context, ...options.ObjectNewOption) (Node, error)
+
+	// WithType is an option for New which allows to change the type of created
+	// dag node.
+	//
+	// Supported types:
+	// * 'empty' - Empty node
+	// * 'unixfs-dir' - Empty UnixFS directory
 	WithType(string) options.ObjectNewOption
 
+	// Put imports the node into merkledag
 	Put(context.Context, Node) (Path, error)
+
+	// Get returns the node for the path
 	Get(context.Context, Path) (Node, error)
+
+	// Data returns reader for data of the node
 	Data(context.Context, Path) (io.Reader, error)
+
+	// Links returns lint or links the node contains
 	Links(context.Context, Path) ([]*Link, error)
+
+	// Stat returns information about the node
 	Stat(context.Context, 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) (Node, error)
+
+	// WithCreate is an option for AddLink which specifies whether create required
+	// directories for the child
 	WithCreate(create bool) options.ObjectAddLinkOption
 
-	RmLink(context.Context, Path, string) (Node, error)
+	// RmLink removes a link from the node
+	RmLink(ctx context.Context, base Path, link string) (Node, error)
+
+	// AppendData appends data to the node
 	AppendData(context.Context, Path, io.Reader) (Node, error)
+
+	// SetData sets the data contained in the node
 	SetData(context.Context, Path, io.Reader) (Node, error)
 }
 
+// ObjectStat provides information about dag nodes
 type ObjectStat struct {
-	Cid            *cid.Cid
-	NumLinks       int
-	BlockSize      int
-	LinksSize      int
-	DataSize       int
+	// Cid is the CID of the node
+	Cid *cid.Cid
+
+	// NumLinks is number of links the node contains
+	NumLinks int
+
+	// BlockSize is size of the raw serialized node
+	BlockSize int
+
+	// LinksSize is size of the links block section
+	LinksSize int
+
+	// DataSize is the size of data block section
+	DataSize int
+
+	// CumulativeSize is size of node
 	CumulativeSize int
 }
 

From 540ec53bf8308b9b45d1ebbfc6e23d775ec779f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Jan 2018 17:20:16 +0100
Subject: [PATCH 032/247] coreapi: implement object.Put
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@104bc87d13e259e45b68c3d00231e140a7b88fb6

This commit was moved from ipfs/boxo@8162a16f7c173b07fa645d5a20121f1ad29e5198
---
 core/coreiface/interface.go      | 15 +++++++++++++--
 core/coreiface/options/object.go | 26 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 7809c8b99..3e0e3d460 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -64,6 +64,9 @@ type CoreAPI interface {
 	// Key returns an implementation of Key API.
 	Key() KeyAPI
 
+	// ObjectAPI returns an implementation of Object API
+	Object() ObjectAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (Path, error)
 
@@ -205,8 +208,16 @@ type ObjectAPI interface {
 	// * 'unixfs-dir' - Empty UnixFS directory
 	WithType(string) options.ObjectNewOption
 
-	// Put imports the node into merkledag
-	Put(context.Context, Node) (Path, error)
+	// Put imports the data into merkledag
+	Put(context.Context, io.Reader, ...options.ObjectPutOption) (Path, error)
+
+	// WithInputEnc is an option for Put which specifies the input encoding of the
+	// data. Default is "json".
+	//
+	// Supported encodings:
+	// * "protobuf"
+	// * "json"
+	WithInputEnc(e string) options.ObjectPutOption
 
 	// Get returns the node for the path
 	Get(context.Context, Path) (Node, error)
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index 6a144ab2b..fe86a1cde 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -4,11 +4,16 @@ type ObjectNewSettings struct {
 	Type string
 }
 
+type ObjectPutSettings struct {
+	InputEnc string
+}
+
 type ObjectAddLinkSettings struct {
 	Create bool
 }
 
 type ObjectNewOption func(*ObjectNewSettings) error
+type ObjectPutOption func(*ObjectPutSettings) error
 type ObjectAddLinkOption func(*ObjectAddLinkSettings) error
 
 func ObjectNewOptions(opts ...ObjectNewOption) (*ObjectNewSettings, error) {
@@ -25,6 +30,20 @@ func ObjectNewOptions(opts ...ObjectNewOption) (*ObjectNewSettings, error) {
 	return options, nil
 }
 
+func ObjectPutOptions(opts ...ObjectPutOption) (*ObjectPutSettings, error) {
+	options := &ObjectPutSettings{
+		InputEnc: "json",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
 func ObjectAddLinkOptions(opts ...ObjectAddLinkOption) (*ObjectAddLinkSettings, error) {
 	options := &ObjectAddLinkSettings{
 		Create: false,
@@ -48,6 +67,13 @@ func (api *ObjectOptions) WithType(t string) ObjectNewOption {
 	}
 }
 
+func (api *ObjectOptions) WithInputEnc(e string) ObjectPutOption {
+	return func(settings *ObjectPutSettings) error {
+		settings.InputEnc = e
+		return nil
+	}
+}
+
 func (api *ObjectOptions) WithCreate(create bool) ObjectAddLinkOption {
 	return func(settings *ObjectAddLinkSettings) error {
 		settings.Create = create

From a8a84d5b1bc8125a5113e80b994193e8f3fab9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 5 Jan 2018 01:13:07 +0100
Subject: [PATCH 033/247] coreapi: object API tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@858d49b07c296b36a58fa4d4469f5e08a9f9b5e7

This commit was moved from ipfs/boxo@d878d812272fc70b7e3e799f139056885dab474f
---
 core/coreiface/interface.go      | 18 +++++++++++++-----
 core/coreiface/options/object.go |  9 +++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 3e0e3d460..9dca7f3c9 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -219,6 +219,14 @@ type ObjectAPI interface {
 	// * "json"
 	WithInputEnc(e string) options.ObjectPutOption
 
+	// WithDataType specifies the encoding of data field when using Josn or XML
+	// input encoding.
+	//
+	// Supported types:
+	// * "text" (default)
+	// * "base64"
+	WithDataType(t string) options.ObjectPutOption
+
 	// Get returns the node for the path
 	Get(context.Context, Path) (Node, error)
 
@@ -234,20 +242,20 @@ type ObjectAPI interface {
 	// 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) (Node, error)
+	AddLink(ctx context.Context, base Path, name string, child Path, opts ...options.ObjectAddLinkOption) (Path, error)
 
 	// WithCreate is an option for AddLink which specifies whether create required
 	// directories for the child
 	WithCreate(create bool) options.ObjectAddLinkOption
 
 	// RmLink removes a link from the node
-	RmLink(ctx context.Context, base Path, link string) (Node, error)
+	RmLink(ctx context.Context, base Path, link string) (Path, error)
 
 	// AppendData appends data to the node
-	AppendData(context.Context, Path, io.Reader) (Node, error)
+	AppendData(context.Context, Path, io.Reader) (Path, error)
 
 	// SetData sets the data contained in the node
-	SetData(context.Context, Path, io.Reader) (Node, error)
+	SetData(context.Context, Path, io.Reader) (Path, error)
 }
 
 // ObjectStat provides information about dag nodes
@@ -267,7 +275,7 @@ type ObjectStat struct {
 	// DataSize is the size of data block section
 	DataSize int
 
-	// CumulativeSize is size of node
+	// CumulativeSize is size of the tree (BlockSize + link sizes)
 	CumulativeSize int
 }
 
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index fe86a1cde..9c8c9a9dd 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -6,6 +6,7 @@ type ObjectNewSettings struct {
 
 type ObjectPutSettings struct {
 	InputEnc string
+	DataType string
 }
 
 type ObjectAddLinkSettings struct {
@@ -33,6 +34,7 @@ func ObjectNewOptions(opts ...ObjectNewOption) (*ObjectNewSettings, error) {
 func ObjectPutOptions(opts ...ObjectPutOption) (*ObjectPutSettings, error) {
 	options := &ObjectPutSettings{
 		InputEnc: "json",
+		DataType: "text",
 	}
 
 	for _, opt := range opts {
@@ -74,6 +76,13 @@ func (api *ObjectOptions) WithInputEnc(e string) ObjectPutOption {
 	}
 }
 
+func (api *ObjectOptions) WithDataType(t string) ObjectPutOption {
+	return func(settings *ObjectPutSettings) error {
+		settings.DataType = t
+		return nil
+	}
+}
+
 func (api *ObjectOptions) WithCreate(create bool) ObjectAddLinkOption {
 	return func(settings *ObjectAddLinkSettings) error {
 		settings.Create = create

From c56118567677371082f7ff08a2556b101a887b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 5 Jan 2018 01:50:14 +0100
Subject: [PATCH 034/247] coreapi: draft block API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3cd2995b5bd80584d23ba16037045558a17d04b9

This commit was moved from ipfs/boxo@3a525b897573cdf1e8d493d004e6b9623f07527b
---
 core/coreiface/interface.go     | 18 ++++++++++++++++++
 core/coreiface/options/block.go | 14 ++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 core/coreiface/options/block.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index ddcdc8db6..147a85412 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -53,6 +53,11 @@ type Key interface {
 	Path() Path
 }
 
+type BlockStat interface {
+	Size() int
+	Path() Path
+}
+
 // CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API.
@@ -87,6 +92,19 @@ type UnixfsAPI interface {
 	Ls(context.Context, Path) ([]*Link, error)
 }
 
+type BlockAPI interface {
+	Put(context.Context, io.Reader) (Path, error)
+	WithCodec(codec uint64) options.BlockPutOption
+	WithHash(mhType uint64, mhLen int) options.BlockPutOption
+
+	Get(context.Context) (io.Reader, error)
+
+	Rm(context.Context) error
+	WithForce(force bool) options.BlockRmOption
+
+	Stat(context.Context) (BlockStat, error)
+}
+
 // DagAPI specifies the interface to IPLD
 type DagAPI interface {
 	// Put inserts data using specified format and input encoding.
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
new file mode 100644
index 000000000..e2473e3f7
--- /dev/null
+++ b/core/coreiface/options/block.go
@@ -0,0 +1,14 @@
+package options
+
+type BlockPutSettings struct {
+	Codec    uint64
+	MhType   uint64
+	MhLength int
+}
+
+type BlockRmSettings struct {
+	Force bool
+}
+
+type BlockPutOption func(*BlockPutSettings) error
+type BlockRmOption func(*BlockRmSettings) error

From 6b6fdcde60d8198b343e0449533a3fa3e306cff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 6 Jan 2018 16:57:41 +0100
Subject: [PATCH 035/247] coreapi: implement block API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a7509ebfcac3b153716fc1d2cf4bf021d8ece1b5

This commit was moved from ipfs/boxo@bfcc5b4d08e6efbcfb31f0551db2630613b94b49
---
 core/coreiface/interface.go     | 12 ++++---
 core/coreiface/options/block.go | 61 ++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 147a85412..bbe544344 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -62,6 +62,8 @@ type BlockStat interface {
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API.
 	Unixfs() UnixfsAPI
+	// Block returns an implementation of Block API.
+	Block() BlockAPI
 	// Dag returns an implementation of Dag API.
 	Dag() DagAPI
 	// Name returns an implementation of Name API.
@@ -93,16 +95,16 @@ type UnixfsAPI interface {
 }
 
 type BlockAPI interface {
-	Put(context.Context, io.Reader) (Path, error)
-	WithCodec(codec uint64) options.BlockPutOption
+	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
+	WithFormat(codec string) options.BlockPutOption
 	WithHash(mhType uint64, mhLen int) options.BlockPutOption
 
-	Get(context.Context) (io.Reader, error)
+	Get(context.Context, Path) (io.Reader, error)
 
-	Rm(context.Context) error
+	Rm(context.Context, Path, ...options.BlockRmOption) error
 	WithForce(force bool) options.BlockRmOption
 
-	Stat(context.Context) (BlockStat, error)
+	Stat(context.Context, Path) (BlockStat, error)
 }
 
 // DagAPI specifies the interface to IPLD
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index e2473e3f7..7e6ad3230 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -1,7 +1,12 @@
 package options
 
+import (
+	//cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
+	"gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash"
+)
+
 type BlockPutSettings struct {
-	Codec    uint64
+	Codec    string
 	MhType   uint64
 	MhLength int
 }
@@ -12,3 +17,57 @@ type BlockRmSettings struct {
 
 type BlockPutOption func(*BlockPutSettings) error
 type BlockRmOption func(*BlockRmSettings) error
+
+func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, error) {
+	options := &BlockPutSettings{
+		Codec:    "v0",
+		MhType:   multihash.SHA2_256,
+		MhLength: -1,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func BlockRmOptions(opts ...BlockRmOption) (*BlockRmSettings, error) {
+	options := &BlockRmSettings{
+		Force: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type BlockOptions struct{}
+
+func (api *BlockOptions) WithFormat(codec string) BlockPutOption {
+	return func(settings *BlockPutSettings) error {
+		settings.Codec = codec
+		return nil
+	}
+}
+
+func (api *BlockOptions) WithHash(mhType uint64, mhLen int) BlockPutOption {
+	return func(settings *BlockPutSettings) error {
+		settings.MhType = mhType
+		settings.MhLength = mhLen
+		return nil
+	}
+}
+
+func (api *BlockOptions) WithForce(force bool) BlockRmOption {
+	return func(settings *BlockRmSettings) error {
+		settings.Force = force
+		return nil
+	}
+}

From 3615341299acfa25c0061a7afaf60339dc596913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 6 Jan 2018 17:13:33 +0100
Subject: [PATCH 036/247] corapi: block docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1ffde91c6cc373e97ed28eb80ad3fb9ddf5103e1

This commit was moved from ipfs/boxo@db1f6da007f8c3d45668459b81d4b99559b0cea7
---
 core/coreiface/interface.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index bbe544344..2402ecf81 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -94,16 +94,35 @@ type UnixfsAPI interface {
 	Ls(context.Context, Path) ([]*Link, error)
 }
 
+// BlockAPI specifies the interface to the block layer
 type BlockAPI interface {
+	// Put imports raw block data, hashing it using specified settings.
 	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
+
+	// WithFormat is an option for Put which specifies the multicodec to use to
+	// serialize the object. Default is "v0"
 	WithFormat(codec string) options.BlockPutOption
+
+	// WithHash is an option for Put which specifies the multihash settings to use
+	// when hashing the object. Default is mh.SHA2_256 (0x12).
+	// If mhLen is set to -1, default length for the hash will be used
 	WithHash(mhType uint64, mhLen int) options.BlockPutOption
 
+	// Get attempts to resolve the path and return a reader for data in the block
 	Get(context.Context, 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
+
+	// WithForce is an option for Rm which, when set to true, will ignore
+	// non-existing blocks
 	WithForce(force bool) options.BlockRmOption
 
+	// Stat returns information on
 	Stat(context.Context, Path) (BlockStat, error)
 }
 

From b47c82f3c79aa8bcfae27c7f022f62e5362a0b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 31 Jan 2018 00:34:51 +0100
Subject: [PATCH 037/247] coreapi: update block after update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@bf7867a20c4aed75aead015b6c720b16645e9626

This commit was moved from ipfs/boxo@72b62f5f64893169686ccb5569f41545c3ba8c67
---
 core/coreiface/interface.go     | 4 ++++
 core/coreiface/options/block.go | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 2402ecf81..95351e7d0 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -62,12 +62,16 @@ type BlockStat interface {
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API.
 	Unixfs() UnixfsAPI
+
 	// Block returns an implementation of Block API.
 	Block() BlockAPI
+
 	// Dag returns an implementation of Dag API.
 	Dag() DagAPI
+
 	// Name returns an implementation of Name API.
 	Name() NameAPI
+
 	// Key returns an implementation of Key API.
 	Key() KeyAPI
 
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 7e6ad3230..bbb14612f 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -1,8 +1,7 @@
 package options
 
 import (
-	//cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
-	"gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash"
+	"gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
 )
 
 type BlockPutSettings struct {

From 9e02119ee9a6281648fd71aa658a0eaf4a04f341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 9 Jan 2018 01:10:03 +0100
Subject: [PATCH 038/247] coreapi: pin draft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@b3293937f6e9b665c70038d40b304844fd015930

This commit was moved from ipfs/boxo@7b5b64eefb105adf64cc51224ea381a15239767a
---
 core/coreiface/interface.go   | 44 ++++++++++++++++++++++++++
 core/coreiface/options/pin.go | 58 +++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 core/coreiface/options/pin.go

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 95351e7d0..40fa4131e 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -58,6 +58,15 @@ type BlockStat interface {
 	Path() Path
 }
 
+// Pin holds information about pinned resource
+type Pin interface {
+	// Path to the pinned object
+	Path() Path
+
+	// Type of the pin
+	Type() string
+}
+
 // CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API.
@@ -322,5 +331,40 @@ type ObjectStat struct {
 	CumulativeSize int
 }
 
+// PinAPI specifies the interface to pining
+type PinAPI interface {
+	// Add creates new pin, be default recursive - pinning the whole referenced
+	// tree
+	Add(context.Context, Path, ...options.PinAddOption) error
+
+	// WithRecursive is an option for Add which specifies whether to pin an entire
+	// object tree or just one object. Default: true
+	WithRecursive(bool) options.PinAddOption
+
+	// Ls returns list of pinned objects on this node
+	Ls(context.Context) ([]Pin, error)
+
+	// WithType is an option for Ls which allows to specify which pin types should
+	// be returned
+	//
+	// Supported values:
+	// * "direct" - directly pinned objects
+	// * "recursive" - roots of recursive pins
+	// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+	//    objects)
+	// * "all" - all pinned objects (default)
+	WithType(string) options.PinLsOption
+
+	// Rm removes pin for object specified by the path
+	Rm(context.Context, Path) error
+
+	// Update changes one pin to another, skipping checks for matching paths in
+	// the old tree
+	Update(ctx context.Context, from Path, to Path) error
+
+	// Verify verifies the integrity of pinned objects
+	Verify(context.Context) error
+}
+
 var ErrIsDir = errors.New("object is a directory")
 var ErrOffline = errors.New("can't resolve, ipfs node is offline")
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
new file mode 100644
index 000000000..4ad16d555
--- /dev/null
+++ b/core/coreiface/options/pin.go
@@ -0,0 +1,58 @@
+package options
+
+type PinAddSettings struct {
+	Recursive bool
+}
+
+type PinLsSettings struct {
+	Type string
+}
+
+type PinAddOption func(*PinAddSettings) error
+type PinLsOption func(settings *PinLsSettings) error
+
+func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
+	options := &PinAddSettings{
+		Recursive: true,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
+	options := &PinLsSettings{
+		Type: "all",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+type PinOptions struct{}
+
+func (api *PinOptions) WithRecursive(recucsive bool) PinAddOption {
+	return func(settings *PinAddSettings) error {
+		settings.Recursive = recucsive
+		return nil
+	}
+}
+
+func (api *PinOptions) WithType(t string) PinLsOption {
+	return func(settings *PinLsSettings) error {
+		settings.Type = t
+		return nil
+	}
+}

From ae6dbb3642d43bb9b1bbb798a564a120965ab21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 10 Jan 2018 18:41:06 +0100
Subject: [PATCH 039/247] coreapi: implement pin api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@4597fde83e61fa8d63fa7aef8a3118f7e441b6db

This commit was moved from ipfs/boxo@c1c32446e398484fac04c9a35c4ca92f930bbe2a
---
 core/coreiface/interface.go   | 25 ++++++++++++++++++++++---
 core/coreiface/options/pin.go | 27 +++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 40fa4131e..75a168bf3 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -67,6 +67,24 @@ type Pin interface {
 	Type() string
 }
 
+// PinStatus holds information about pin health
+type PinStatus interface {
+	// Ok indicates whether the pin has been verified to be correct
+	Ok() bool
+
+	// BadNodes returns any bad (usually missing) nodes from the pin
+	BadNodes() []BadPinNode
+}
+
+// BadPinNode is a node that has been marked as bad by Pin.Verify
+type BadPinNode interface {
+	// Path is the path of the node
+	Path() Path
+
+	// Err is the reason why the node has been marked as bad
+	Err() error
+}
+
 // CoreAPI defines an unified interface to IPFS for Go programs.
 type CoreAPI interface {
 	// Unixfs returns an implementation of Unixfs API.
@@ -83,6 +101,7 @@ type CoreAPI interface {
 
 	// Key returns an implementation of Key API.
 	Key() KeyAPI
+	Pin() PinAPI
 
 	// ObjectAPI returns an implementation of Object API
 	Object() ObjectAPI
@@ -342,7 +361,7 @@ type PinAPI interface {
 	WithRecursive(bool) options.PinAddOption
 
 	// Ls returns list of pinned objects on this node
-	Ls(context.Context) ([]Pin, error)
+	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
 
 	// WithType is an option for Ls which allows to specify which pin types should
 	// be returned
@@ -360,10 +379,10 @@ type PinAPI interface {
 
 	// Update changes one pin to another, skipping checks for matching paths in
 	// the old tree
-	Update(ctx context.Context, from Path, to Path) error
+	Update(ctx context.Context, from Path, to Path, opts ...options.PinUpdateOption) error
 
 	// Verify verifies the integrity of pinned objects
-	Verify(context.Context) error
+	Verify(context.Context) (<-chan PinStatus, error)
 }
 
 var ErrIsDir = errors.New("object is a directory")
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 4ad16d555..f97f7b16e 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -8,8 +8,13 @@ type PinLsSettings struct {
 	Type string
 }
 
+type PinUpdateSettings struct {
+	Unpin bool
+}
+
 type PinAddOption func(*PinAddSettings) error
 type PinLsOption func(settings *PinLsSettings) error
+type PinUpdateOption func(*PinUpdateSettings) error
 
 func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
 	options := &PinAddSettings{
@@ -41,6 +46,21 @@ func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
 	return options, nil
 }
 
+func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
+	options := &PinUpdateSettings{
+		Unpin: true,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
 type PinOptions struct{}
 
 func (api *PinOptions) WithRecursive(recucsive bool) PinAddOption {
@@ -56,3 +76,10 @@ func (api *PinOptions) WithType(t string) PinLsOption {
 		return nil
 	}
 }
+
+func (api *PinOptions) WithUnpin(unpin bool) PinUpdateOption {
+	return func(settings *PinUpdateSettings) error {
+		settings.Unpin = unpin
+		return nil
+	}
+}

From a313b37f486d3e8ad1cbdfcb3f61e884b7e30b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 17:59:43 +0100
Subject: [PATCH 040/247] coreapi: move unixfs errors to the top
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@848f12365b041d32adfa2ba7d5e3b30a1bc4233b

This commit was moved from ipfs/boxo@963f83df40b7e960430e8da91aef942e58278acd
---
 core/coreiface/interface.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 75a168bf3..4d68b5f4b 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -14,6 +14,9 @@ import (
 	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
 )
 
+var ErrIsDir = errors.New("object is a directory")
+var ErrOffline = errors.New("can't resolve, ipfs node is offline")
+
 // Path is a generic wrapper for paths used in the API. A path can be resolved
 // to a CID using one of Resolve functions in the API.
 type Path interface {
@@ -384,6 +387,3 @@ type PinAPI interface {
 	// Verify verifies the integrity of pinned objects
 	Verify(context.Context) (<-chan PinStatus, error)
 }
-
-var ErrIsDir = errors.New("object is a directory")
-var ErrOffline = errors.New("can't resolve, ipfs node is offline")

From 3f4a3d552477f2c4387e67f79ff30991a2121525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 18:31:28 +0100
Subject: [PATCH 041/247] coreapi: don't alias ipld types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ab9053378b45e67758591727b9140366d4874fc9

This commit was moved from ipfs/boxo@222c7a617e1ee17ba106b5e5279c15931138abc9
---
 core/coreiface/interface.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
index 4d68b5f4b..02525c0d2 100644
--- a/core/coreiface/interface.go
+++ b/core/coreiface/interface.go
@@ -30,11 +30,6 @@ type Path interface {
 	Resolved() bool
 }
 
-// TODO: should we really copy these?
-//       if we didn't, godoc would generate nice links straight to go-ipld-format
-type Node ipld.Node
-type Link ipld.Link
-
 type Reader interface {
 	io.ReadSeeker
 	io.Closer
@@ -114,7 +109,7 @@ type CoreAPI interface {
 
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
-	ResolveNode(context.Context, Path) (Node, error)
+	ResolveNode(context.Context, Path) (ipld.Node, error)
 }
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
@@ -126,7 +121,7 @@ type UnixfsAPI interface {
 	Cat(context.Context, Path) (Reader, error)
 
 	// Ls returns the list of links in a directory
-	Ls(context.Context, Path) ([]*Link, error)
+	Ls(context.Context, Path) ([]*ipld.Link, error)
 }
 
 // BlockAPI specifies the interface to the block layer
@@ -183,7 +178,7 @@ type DagAPI interface {
 	WithHash(mhType uint64, mhLen int) options.DagPutOption
 
 	// Get attempts to resolve and get the node specified by the path
-	Get(ctx context.Context, path Path) (Node, error)
+	Get(ctx context.Context, path Path) (ipld.Node, error)
 
 	// Tree returns list of paths within a node specified by the path.
 	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
@@ -272,7 +267,7 @@ type KeyAPI interface {
 // for manipulating MerkleDAG data structures.
 type ObjectAPI interface {
 	// New creates new, empty (by default) dag-node.
-	New(context.Context, ...options.ObjectNewOption) (Node, error)
+	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
 
 	// WithType is an option for New which allows to change the type of created
 	// dag node.
@@ -302,13 +297,13 @@ type ObjectAPI interface {
 	WithDataType(t string) options.ObjectPutOption
 
 	// Get returns the node for the path
-	Get(context.Context, Path) (Node, error)
+	Get(context.Context, Path) (ipld.Node, error)
 
 	// Data returns reader for data of the node
 	Data(context.Context, Path) (io.Reader, error)
 
 	// Links returns lint or links the node contains
-	Links(context.Context, Path) ([]*Link, error)
+	Links(context.Context, Path) ([]*ipld.Link, error)
 
 	// Stat returns information about the node
 	Stat(context.Context, Path) (*ObjectStat, error)

From cdda2d3e4b7274fc60c237b3b72083f86a710779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 18:46:45 +0100
Subject: [PATCH 042/247] coreapi: split the interface into multiple files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d4077754e8de62308542ca3838c8f280ca4aad22

This commit was moved from ipfs/boxo@a05b8c4e76d49997baeb11f87f247965fe2b33ed
---
 core/coreiface/block.go     |  49 +++++
 core/coreiface/coreapi.go   |  38 ++++
 core/coreiface/dag.go       |  42 ++++
 core/coreiface/errors.go    |   6 +
 core/coreiface/interface.go | 384 ------------------------------------
 core/coreiface/key.go       |  51 +++++
 core/coreiface/name.go      |  55 ++++++
 core/coreiface/object.go    |  96 +++++++++
 core/coreiface/path.go      |  18 ++
 core/coreiface/pin.go       |  69 +++++++
 core/coreiface/unixfs.go    |  20 ++
 core/coreiface/util.go      |  10 +
 12 files changed, 454 insertions(+), 384 deletions(-)
 create mode 100644 core/coreiface/block.go
 create mode 100644 core/coreiface/coreapi.go
 create mode 100644 core/coreiface/dag.go
 create mode 100644 core/coreiface/errors.go
 delete mode 100644 core/coreiface/interface.go
 create mode 100644 core/coreiface/key.go
 create mode 100644 core/coreiface/name.go
 create mode 100644 core/coreiface/object.go
 create mode 100644 core/coreiface/path.go
 create mode 100644 core/coreiface/pin.go
 create mode 100644 core/coreiface/unixfs.go
 create mode 100644 core/coreiface/util.go

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
new file mode 100644
index 000000000..f38a664c3
--- /dev/null
+++ b/core/coreiface/block.go
@@ -0,0 +1,49 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+// BlockStat contains information about a block
+type BlockStat interface {
+	// Size is the size of a block
+	Size() int
+
+	// Path returns path to the block
+	Path() Path
+}
+
+// BlockAPI specifies the interface to the block layer
+type BlockAPI interface {
+	// Put imports raw block data, hashing it using specified settings.
+	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
+
+	// WithFormat is an option for Put which specifies the multicodec to use to
+	// serialize the object. Default is "v0"
+	WithFormat(codec string) options.BlockPutOption
+
+	// WithHash is an option for Put which specifies the multihash settings to use
+	// when hashing the object. Default is mh.SHA2_256 (0x12).
+	// If mhLen is set to -1, default length for the hash will be used
+	WithHash(mhType uint64, mhLen int) options.BlockPutOption
+
+	// Get attempts to resolve the path and return a reader for data in the block
+	Get(context.Context, 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
+
+	// WithForce is an option for Rm which, when set to true, will ignore
+	// non-existing blocks
+	WithForce(force bool) options.BlockRmOption
+
+	// Stat returns information on
+	Stat(context.Context, Path) (BlockStat, error)
+}
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
new file mode 100644
index 000000000..f1388e5bc
--- /dev/null
+++ b/core/coreiface/coreapi.go
@@ -0,0 +1,38 @@
+// Package iface defines IPFS Core API which is a set of interfaces used to
+// interact with IPFS nodes.
+package iface
+
+import (
+	"context"
+
+	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+)
+
+// CoreAPI defines an unified interface to IPFS for Go programs.
+type CoreAPI interface {
+	// Unixfs returns an implementation of Unixfs API.
+	Unixfs() UnixfsAPI
+
+	// Block returns an implementation of Block API.
+	Block() BlockAPI
+
+	// Dag returns an implementation of Dag API.
+	Dag() DagAPI
+
+	// Name returns an implementation of Name API.
+	Name() NameAPI
+
+	// Key returns an implementation of Key API.
+	Key() KeyAPI
+	Pin() PinAPI
+
+	// ObjectAPI returns an implementation of Object API
+	Object() ObjectAPI
+
+	// ResolvePath resolves the path using Unixfs resolver
+	ResolvePath(context.Context, Path) (Path, 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)
+}
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
new file mode 100644
index 000000000..1635d71b1
--- /dev/null
+++ b/core/coreiface/dag.go
@@ -0,0 +1,42 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+)
+
+// DagAPI specifies the interface to IPLD
+type DagAPI interface {
+	// Put inserts data using specified format and input encoding.
+	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
+	// "sha256" are used.
+	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (Path, error)
+
+	// WithInputEnc is an option for Put which specifies the input encoding of the
+	// data. Default is "json", most formats/codecs support "raw"
+	WithInputEnc(enc string) options.DagPutOption
+
+	// WithCodec is an option for Put which specifies the multicodec to use to
+	// serialize the object. Default is cid.DagCBOR (0x71)
+	WithCodec(codec uint64) options.DagPutOption
+
+	// WithHash is an option for Put which specifies the multihash settings to use
+	// when hashing the object. Default is based on the codec used
+	// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
+	// the hash will be used
+	WithHash(mhType uint64, mhLen int) options.DagPutOption
+
+	// Get attempts to resolve and get the node specified by the path
+	Get(ctx context.Context, path Path) (ipld.Node, error)
+
+	// Tree returns list of paths within a node specified by the path.
+	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
+
+	// WithDepth is an option for Tree which specifies maximum depth of the
+	// returned tree. Default is -1 (no depth limit)
+	WithDepth(depth int) options.DagTreeOption
+}
diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
new file mode 100644
index 000000000..73442be11
--- /dev/null
+++ b/core/coreiface/errors.go
@@ -0,0 +1,6 @@
+package iface
+
+import "errors"
+
+var ErrIsDir = errors.New("object is a directory")
+var ErrOffline = errors.New("can't resolve, ipfs node is offline")
diff --git a/core/coreiface/interface.go b/core/coreiface/interface.go
deleted file mode 100644
index 02525c0d2..000000000
--- a/core/coreiface/interface.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Package iface defines IPFS Core API which is a set of interfaces used to
-// interact with IPFS nodes.
-package iface
-
-import (
-	"context"
-	"errors"
-	"io"
-	"time"
-
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-
-	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
-	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
-)
-
-var ErrIsDir = errors.New("object is a directory")
-var ErrOffline = errors.New("can't resolve, ipfs node is offline")
-
-// Path is a generic wrapper for paths used in the API. A path can be resolved
-// to a CID using one of Resolve functions in the API.
-type Path interface {
-	// String returns the path as a string.
-	String() string
-	// Cid returns cid referred to by path
-	Cid() *cid.Cid
-	// Root returns cid of root path
-	Root() *cid.Cid
-	// Resolved returns whether path has been fully resolved
-	Resolved() bool
-}
-
-type Reader interface {
-	io.ReadSeeker
-	io.Closer
-}
-
-// IpnsEntry specifies the interface to IpnsEntries
-type IpnsEntry interface {
-	// Name returns IpnsEntry name
-	Name() string
-	// Value returns IpnsEntry value
-	Value() Path
-}
-
-// Key specifies the interface to Keys in KeyAPI Keystore
-type Key interface {
-	// Key returns key name
-	Name() string
-	// Path returns key path
-	Path() Path
-}
-
-type BlockStat interface {
-	Size() int
-	Path() Path
-}
-
-// Pin holds information about pinned resource
-type Pin interface {
-	// Path to the pinned object
-	Path() Path
-
-	// Type of the pin
-	Type() string
-}
-
-// PinStatus holds information about pin health
-type PinStatus interface {
-	// Ok indicates whether the pin has been verified to be correct
-	Ok() bool
-
-	// BadNodes returns any bad (usually missing) nodes from the pin
-	BadNodes() []BadPinNode
-}
-
-// BadPinNode is a node that has been marked as bad by Pin.Verify
-type BadPinNode interface {
-	// Path is the path of the node
-	Path() Path
-
-	// Err is the reason why the node has been marked as bad
-	Err() error
-}
-
-// CoreAPI defines an unified interface to IPFS for Go programs.
-type CoreAPI interface {
-	// Unixfs returns an implementation of Unixfs API.
-	Unixfs() UnixfsAPI
-
-	// Block returns an implementation of Block API.
-	Block() BlockAPI
-
-	// Dag returns an implementation of Dag API.
-	Dag() DagAPI
-
-	// Name returns an implementation of Name API.
-	Name() NameAPI
-
-	// Key returns an implementation of Key API.
-	Key() KeyAPI
-	Pin() PinAPI
-
-	// ObjectAPI returns an implementation of Object API
-	Object() ObjectAPI
-
-	// ResolvePath resolves the path using Unixfs resolver
-	ResolvePath(context.Context, Path) (Path, 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)
-}
-
-// UnixfsAPI is the basic interface to immutable files in IPFS
-type UnixfsAPI interface {
-	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.Reader) (Path, error)
-
-	// Cat returns a reader for the file
-	Cat(context.Context, Path) (Reader, error)
-
-	// Ls returns the list of links in a directory
-	Ls(context.Context, Path) ([]*ipld.Link, error)
-}
-
-// BlockAPI specifies the interface to the block layer
-type BlockAPI interface {
-	// Put imports raw block data, hashing it using specified settings.
-	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
-
-	// WithFormat is an option for Put which specifies the multicodec to use to
-	// serialize the object. Default is "v0"
-	WithFormat(codec string) options.BlockPutOption
-
-	// WithHash is an option for Put which specifies the multihash settings to use
-	// when hashing the object. Default is mh.SHA2_256 (0x12).
-	// If mhLen is set to -1, default length for the hash will be used
-	WithHash(mhType uint64, mhLen int) options.BlockPutOption
-
-	// Get attempts to resolve the path and return a reader for data in the block
-	Get(context.Context, 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
-
-	// WithForce is an option for Rm which, when set to true, will ignore
-	// non-existing blocks
-	WithForce(force bool) options.BlockRmOption
-
-	// Stat returns information on
-	Stat(context.Context, Path) (BlockStat, error)
-}
-
-// DagAPI specifies the interface to IPLD
-type DagAPI interface {
-	// Put inserts data using specified format and input encoding.
-	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
-	// "sha256" are used.
-	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (Path, error)
-
-	// WithInputEnc is an option for Put which specifies the input encoding of the
-	// data. Default is "json", most formats/codecs support "raw"
-	WithInputEnc(enc string) options.DagPutOption
-
-	// WithCodec is an option for Put which specifies the multicodec to use to
-	// serialize the object. Default is cid.DagCBOR (0x71)
-	WithCodec(codec uint64) options.DagPutOption
-
-	// WithHash is an option for Put which specifies the multihash settings to use
-	// when hashing the object. Default is based on the codec used
-	// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
-	// the hash will be used
-	WithHash(mhType uint64, mhLen int) options.DagPutOption
-
-	// Get attempts to resolve and get the node specified by the path
-	Get(ctx context.Context, path Path) (ipld.Node, error)
-
-	// Tree returns list of paths within a node specified by the path.
-	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
-
-	// WithDepth is an option for Tree which specifies maximum depth of the
-	// returned tree. Default is -1 (no depth limit)
-	WithDepth(depth int) options.DagTreeOption
-}
-
-// NameAPI specifies the interface to IPNS.
-//
-// IPNS is a PKI namespace, where names are the hashes of public keys, and the
-// private key enables publishing new (signed) values. In both publish and
-// resolve, the default name used is the node's own PeerID, which is the hash of
-// its public key.
-//
-// 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)
-
-	// WithValidTime is an option for Publish which specifies for how long the
-	// entry will remain valid. Default value is 24h
-	WithValidTime(validTime time.Duration) options.NamePublishOption
-
-	// WithKey is an option for Publish which specifies the key to use for
-	// publishing. Default value is "self" which is the node's own PeerID.
-	// The key parameter must be either PeerID or keystore key alias.
-	//
-	// You can use KeyAPI to list and generate more names and their respective keys.
-	WithKey(key string) options.NamePublishOption
-
-	// Resolve attempts to resolve the newest version of the specified name
-	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
-
-	// WithRecursive is an option for Resolve which specifies whether to perform a
-	// recursive lookup. Default value is false
-	WithRecursive(recursive bool) options.NameResolveOption
-
-	// WithLocal is an option for Resolve which specifies if the lookup should be
-	// offline. Default value is false
-	WithLocal(local bool) options.NameResolveOption
-
-	// WithCache is an option for Resolve which specifies if cache should be used.
-	// Default value is true
-	WithCache(cache bool) options.NameResolveOption
-}
-
-// KeyAPI specifies the interface to Keystore
-type KeyAPI interface {
-	// Generate generates new key, stores it in the keystore under the specified
-	// name and returns a base58 encoded multihash of it's public key
-	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (Key, error)
-
-	// WithType is an option for Generate which specifies which algorithm
-	// should be used for the key. Default is options.RSAKey
-	//
-	// Supported key types:
-	// * options.RSAKey
-	// * options.Ed25519Key
-	WithType(algorithm string) options.KeyGenerateOption
-
-	// WithSize is an option for Generate which specifies the size of the key to
-	// generated. Default is -1
-	//
-	// value of -1 means 'use default size for key type':
-	//  * 2048 for RSA
-	WithSize(size int) options.KeyGenerateOption
-
-	// Rename renames oldName key to newName. Returns the key and whether another
-	// key was overwritten, or an error
-	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (Key, bool, error)
-
-	// WithForce is an option for Rename which specifies whether to allow to
-	// replace existing keys.
-	WithForce(force bool) options.KeyRenameOption
-
-	// List lists keys stored in keystore
-	List(ctx context.Context) ([]Key, error)
-
-	// Remove removes keys from keystore. Returns ipns path of the removed key
-	Remove(ctx context.Context, name string) (Path, error)
-}
-
-// ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
-// for manipulating MerkleDAG data structures.
-type ObjectAPI interface {
-	// New creates new, empty (by default) dag-node.
-	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
-
-	// WithType is an option for New which allows to change the type of created
-	// dag node.
-	//
-	// Supported types:
-	// * 'empty' - Empty node
-	// * 'unixfs-dir' - Empty UnixFS directory
-	WithType(string) options.ObjectNewOption
-
-	// Put imports the data into merkledag
-	Put(context.Context, io.Reader, ...options.ObjectPutOption) (Path, error)
-
-	// WithInputEnc is an option for Put which specifies the input encoding of the
-	// data. Default is "json".
-	//
-	// Supported encodings:
-	// * "protobuf"
-	// * "json"
-	WithInputEnc(e string) options.ObjectPutOption
-
-	// WithDataType specifies the encoding of data field when using Josn or XML
-	// input encoding.
-	//
-	// Supported types:
-	// * "text" (default)
-	// * "base64"
-	WithDataType(t string) options.ObjectPutOption
-
-	// Get returns the node for the path
-	Get(context.Context, Path) (ipld.Node, error)
-
-	// Data returns reader for data of the node
-	Data(context.Context, Path) (io.Reader, error)
-
-	// Links returns lint or links the node contains
-	Links(context.Context, Path) ([]*ipld.Link, error)
-
-	// Stat returns information about the node
-	Stat(context.Context, 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) (Path, error)
-
-	// WithCreate is an option for AddLink which specifies whether create required
-	// directories for the child
-	WithCreate(create bool) options.ObjectAddLinkOption
-
-	// RmLink removes a link from the node
-	RmLink(ctx context.Context, base Path, link string) (Path, error)
-
-	// AppendData appends data to the node
-	AppendData(context.Context, Path, io.Reader) (Path, error)
-
-	// SetData sets the data contained in the node
-	SetData(context.Context, Path, io.Reader) (Path, error)
-}
-
-// ObjectStat provides information about dag nodes
-type ObjectStat struct {
-	// Cid is the CID of the node
-	Cid *cid.Cid
-
-	// NumLinks is number of links the node contains
-	NumLinks int
-
-	// BlockSize is size of the raw serialized node
-	BlockSize int
-
-	// LinksSize is size of the links block section
-	LinksSize int
-
-	// DataSize is the size of data block section
-	DataSize int
-
-	// CumulativeSize is size of the tree (BlockSize + link sizes)
-	CumulativeSize int
-}
-
-// PinAPI specifies the interface to pining
-type PinAPI interface {
-	// Add creates new pin, be default recursive - pinning the whole referenced
-	// tree
-	Add(context.Context, Path, ...options.PinAddOption) error
-
-	// WithRecursive is an option for Add which specifies whether to pin an entire
-	// object tree or just one object. Default: true
-	WithRecursive(bool) options.PinAddOption
-
-	// Ls returns list of pinned objects on this node
-	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
-
-	// WithType is an option for Ls which allows to specify which pin types should
-	// be returned
-	//
-	// Supported values:
-	// * "direct" - directly pinned objects
-	// * "recursive" - roots of recursive pins
-	// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-	//    objects)
-	// * "all" - all pinned objects (default)
-	WithType(string) options.PinLsOption
-
-	// Rm removes pin for object specified by the path
-	Rm(context.Context, Path) error
-
-	// Update changes one pin to another, skipping checks for matching paths in
-	// the old tree
-	Update(ctx context.Context, from Path, to Path, opts ...options.PinUpdateOption) error
-
-	// Verify verifies the integrity of pinned objects
-	Verify(context.Context) (<-chan PinStatus, error)
-}
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
new file mode 100644
index 000000000..730e855d7
--- /dev/null
+++ b/core/coreiface/key.go
@@ -0,0 +1,51 @@
+package iface
+
+import (
+	"context"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+// Key specifies the interface to Keys in KeyAPI Keystore
+type Key interface {
+	// Key returns key name
+	Name() string
+	// Path returns key path
+	Path() Path
+}
+
+// KeyAPI specifies the interface to Keystore
+type KeyAPI interface {
+	// Generate generates new key, stores it in the keystore under the specified
+	// name and returns a base58 encoded multihash of it's public key
+	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (Key, error)
+
+	// WithType is an option for Generate which specifies which algorithm
+	// should be used for the key. Default is options.RSAKey
+	//
+	// Supported key types:
+	// * options.RSAKey
+	// * options.Ed25519Key
+	WithType(algorithm string) options.KeyGenerateOption
+
+	// WithSize is an option for Generate which specifies the size of the key to
+	// generated. Default is -1
+	//
+	// value of -1 means 'use default size for key type':
+	//  * 2048 for RSA
+	WithSize(size int) options.KeyGenerateOption
+
+	// Rename renames oldName key to newName. Returns the key and whether another
+	// key was overwritten, or an error
+	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (Key, bool, error)
+
+	// WithForce is an option for Rename which specifies whether to allow to
+	// replace existing keys.
+	WithForce(force bool) options.KeyRenameOption
+
+	// List lists keys stored in keystore
+	List(ctx context.Context) ([]Key, error)
+
+	// Remove removes keys from keystore. Returns ipns path of the removed key
+	Remove(ctx context.Context, name string) (Path, error)
+}
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
new file mode 100644
index 000000000..6d17d840a
--- /dev/null
+++ b/core/coreiface/name.go
@@ -0,0 +1,55 @@
+package iface
+
+import (
+	"context"
+	"time"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+// IpnsEntry specifies the interface to IpnsEntries
+type IpnsEntry interface {
+	// Name returns IpnsEntry name
+	Name() string
+	// Value returns IpnsEntry value
+	Value() Path
+}
+
+// NameAPI specifies the interface to IPNS.
+//
+// IPNS is a PKI namespace, where names are the hashes of public keys, and the
+// private key enables publishing new (signed) values. In both publish and
+// resolve, the default name used is the node's own PeerID, which is the hash of
+// its public key.
+//
+// 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)
+
+	// WithValidTime is an option for Publish which specifies for how long the
+	// entry will remain valid. Default value is 24h
+	WithValidTime(validTime time.Duration) options.NamePublishOption
+
+	// WithKey is an option for Publish which specifies the key to use for
+	// publishing. Default value is "self" which is the node's own PeerID.
+	// The key parameter must be either PeerID or keystore key alias.
+	//
+	// You can use KeyAPI to list and generate more names and their respective keys.
+	WithKey(key string) options.NamePublishOption
+
+	// Resolve attempts to resolve the newest version of the specified name
+	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
+
+	// WithRecursive is an option for Resolve which specifies whether to perform a
+	// recursive lookup. Default value is false
+	WithRecursive(recursive bool) options.NameResolveOption
+
+	// WithLocal is an option for Resolve which specifies if the lookup should be
+	// offline. Default value is false
+	WithLocal(local bool) options.NameResolveOption
+
+	// WithCache is an option for Resolve which specifies if cache should be used.
+	// Default value is true
+	WithCache(cache bool) options.NameResolveOption
+}
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
new file mode 100644
index 000000000..75837f93e
--- /dev/null
+++ b/core/coreiface/object.go
@@ -0,0 +1,96 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
+	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+)
+
+// ObjectStat provides information about dag nodes
+type ObjectStat struct {
+	// Cid is the CID of the node
+	Cid *cid.Cid
+
+	// NumLinks is number of links the node contains
+	NumLinks int
+
+	// BlockSize is size of the raw serialized node
+	BlockSize int
+
+	// LinksSize is size of the links block section
+	LinksSize int
+
+	// DataSize is the size of data block section
+	DataSize int
+
+	// CumulativeSize is size of the tree (BlockSize + link sizes)
+	CumulativeSize int
+}
+
+// ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
+// for manipulating MerkleDAG data structures.
+type ObjectAPI interface {
+	// New creates new, empty (by default) dag-node.
+	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
+
+	// WithType is an option for New which allows to change the type of created
+	// dag node.
+	//
+	// Supported types:
+	// * 'empty' - Empty node
+	// * 'unixfs-dir' - Empty UnixFS directory
+	WithType(string) options.ObjectNewOption
+
+	// Put imports the data into merkledag
+	Put(context.Context, io.Reader, ...options.ObjectPutOption) (Path, error)
+
+	// WithInputEnc is an option for Put which specifies the input encoding of the
+	// data. Default is "json".
+	//
+	// Supported encodings:
+	// * "protobuf"
+	// * "json"
+	WithInputEnc(e string) options.ObjectPutOption
+
+	// WithDataType specifies the encoding of data field when using Josn or XML
+	// input encoding.
+	//
+	// Supported types:
+	// * "text" (default)
+	// * "base64"
+	WithDataType(t string) options.ObjectPutOption
+
+	// Get returns the node for the path
+	Get(context.Context, Path) (ipld.Node, error)
+
+	// Data returns reader for data of the node
+	Data(context.Context, Path) (io.Reader, error)
+
+	// Links returns lint or links the node contains
+	Links(context.Context, Path) ([]*ipld.Link, error)
+
+	// Stat returns information about the node
+	Stat(context.Context, 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) (Path, error)
+
+	// WithCreate is an option for AddLink which specifies whether create required
+	// directories for the child
+	WithCreate(create bool) options.ObjectAddLinkOption
+
+	// RmLink removes a link from the node
+	RmLink(ctx context.Context, base Path, link string) (Path, error)
+
+	// AppendData appends data to the node
+	AppendData(context.Context, Path, io.Reader) (Path, error)
+
+	// SetData sets the data contained in the node
+	SetData(context.Context, Path, io.Reader) (Path, error)
+}
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
new file mode 100644
index 000000000..b2160b942
--- /dev/null
+++ b/core/coreiface/path.go
@@ -0,0 +1,18 @@
+package iface
+
+import (
+	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
+)
+
+// Path is a generic wrapper for paths used in the API. A path can be resolved
+// to a CID using one of Resolve functions in the API.
+type Path interface {
+	// String returns the path as a string.
+	String() string
+	// Cid returns cid referred to by path
+	Cid() *cid.Cid
+	// Root returns cid of root path
+	Root() *cid.Cid
+	// Resolved returns whether path has been fully resolved
+	Resolved() bool
+}
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
new file mode 100644
index 000000000..47a5a0bb2
--- /dev/null
+++ b/core/coreiface/pin.go
@@ -0,0 +1,69 @@
+package iface
+
+import (
+	"context"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+// Pin holds information about pinned resource
+type Pin interface {
+	// Path to the pinned object
+	Path() Path
+
+	// Type of the pin
+	Type() string
+}
+
+// PinStatus holds information about pin health
+type PinStatus interface {
+	// Ok indicates whether the pin has been verified to be correct
+	Ok() bool
+
+	// BadNodes returns any bad (usually missing) nodes from the pin
+	BadNodes() []BadPinNode
+}
+
+// BadPinNode is a node that has been marked as bad by Pin.Verify
+type BadPinNode interface {
+	// Path is the path of the node
+	Path() Path
+
+	// Err is the reason why the node has been marked as bad
+	Err() error
+}
+
+// PinAPI specifies the interface to pining
+type PinAPI interface {
+	// Add creates new pin, be default recursive - pinning the whole referenced
+	// tree
+	Add(context.Context, Path, ...options.PinAddOption) error
+
+	// WithRecursive is an option for Add which specifies whether to pin an entire
+	// object tree or just one object. Default: true
+	WithRecursive(bool) options.PinAddOption
+
+	// Ls returns list of pinned objects on this node
+	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
+
+	// WithType is an option for Ls which allows to specify which pin types should
+	// be returned
+	//
+	// Supported values:
+	// * "direct" - directly pinned objects
+	// * "recursive" - roots of recursive pins
+	// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+	//    objects)
+	// * "all" - all pinned objects (default)
+	WithType(string) options.PinLsOption
+
+	// Rm removes pin for object specified by the path
+	Rm(context.Context, Path) error
+
+	// Update changes one pin to another, skipping checks for matching paths in
+	// the old tree
+	Update(ctx context.Context, from Path, to Path, opts ...options.PinUpdateOption) error
+
+	// Verify verifies the integrity of pinned objects
+	Verify(context.Context) (<-chan PinStatus, error)
+}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
new file mode 100644
index 000000000..c1b4efa43
--- /dev/null
+++ b/core/coreiface/unixfs.go
@@ -0,0 +1,20 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+)
+
+// UnixfsAPI is the basic interface to immutable files in IPFS
+type UnixfsAPI interface {
+	// Add imports the data from the reader into merkledag file
+	Add(context.Context, io.Reader) (Path, error)
+
+	// Cat returns a reader for the file
+	Cat(context.Context, Path) (Reader, error)
+
+	// Ls returns the list of links in a directory
+	Ls(context.Context, Path) ([]*ipld.Link, error)
+}
diff --git a/core/coreiface/util.go b/core/coreiface/util.go
new file mode 100644
index 000000000..8fd3e058f
--- /dev/null
+++ b/core/coreiface/util.go
@@ -0,0 +1,10 @@
+package iface
+
+import (
+	"io"
+)
+
+type Reader interface {
+	io.ReadSeeker
+	io.Closer
+}

From 809fb6b34a9ccb507a7917265227a6941458fe1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 18:52:10 +0100
Subject: [PATCH 043/247] coreapi: minor doc fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@dba6c1b7a33059613de8019eafb527031e52e61d

This commit was moved from ipfs/boxo@64d53e28ce0e428dadef3a318a1f44eb983376e7
---
 core/coreiface/coreapi.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index f1388e5bc..9428b3b63 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -8,22 +8,24 @@ import (
 	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
 )
 
-// CoreAPI defines an unified interface to IPFS for Go programs.
+// CoreAPI defines an unified interface to IPFS for Go programs
 type CoreAPI interface {
-	// Unixfs returns an implementation of Unixfs API.
+	// Unixfs returns an implementation of Unixfs API
 	Unixfs() UnixfsAPI
 
-	// Block returns an implementation of Block API.
+	// Block returns an implementation of Block API
 	Block() BlockAPI
 
-	// Dag returns an implementation of Dag API.
+	// Dag returns an implementation of Dag API
 	Dag() DagAPI
 
-	// Name returns an implementation of Name API.
+	// Name returns an implementation of Name API
 	Name() NameAPI
 
-	// Key returns an implementation of Key API.
+	// Key returns an implementation of Key API
 	Key() KeyAPI
+
+	// Pin returns an implementation of Pin API
 	Pin() PinAPI
 
 	// ObjectAPI returns an implementation of Object API

From f3162d6ec66cecaf16eb7cd2f7db03035741db37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 22:17:27 +0100
Subject: [PATCH 044/247] coreapi: var block for errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@60fc569676d93341f657737a221de2228a178183

This commit was moved from ipfs/boxo@5de1a8368e0d7b6abe9226f7e789ab8a521fb886
---
 core/coreiface/errors.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 73442be11..81f978971 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -2,5 +2,7 @@ package iface
 
 import "errors"
 
-var ErrIsDir = errors.New("object is a directory")
-var ErrOffline = errors.New("can't resolve, ipfs node is offline")
+var (
+	ErrIsDir   = errors.New("object is a directory")
+	ErrOffline = errors.New("can't resolve, ipfs node is offline")
+)

From 5e488491670bdb45a3fa957b624f44a068cb40a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 11 Mar 2018 18:55:35 +0100
Subject: [PATCH 045/247] coreapi: remove options from interfaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@38ccf0555876033759418de2c43b5d9c727b2c19

This commit was moved from ipfs/boxo@595afb8260f48d77dfff80a7d4a191f185adfb87
---
 core/coreiface/block.go          | 13 -------------
 core/coreiface/dag.go            | 18 ------------------
 core/coreiface/key.go            | 19 -------------------
 core/coreiface/name.go           | 24 ------------------------
 core/coreiface/object.go         | 28 ----------------------------
 core/coreiface/options/block.go  | 17 +++++++++++++----
 core/coreiface/options/dag.go    | 22 +++++++++++++++++-----
 core/coreiface/options/key.go    | 23 +++++++++++++++++++----
 core/coreiface/options/name.go   | 27 +++++++++++++++++++++------
 core/coreiface/options/object.go | 32 +++++++++++++++++++++++++++-----
 core/coreiface/options/pin.go    | 23 +++++++++++++++++++----
 core/coreiface/pin.go            | 15 ---------------
 12 files changed, 116 insertions(+), 145 deletions(-)

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index f38a664c3..a9e577d76 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -21,15 +21,6 @@ type BlockAPI interface {
 	// Put imports raw block data, hashing it using specified settings.
 	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
 
-	// WithFormat is an option for Put which specifies the multicodec to use to
-	// serialize the object. Default is "v0"
-	WithFormat(codec string) options.BlockPutOption
-
-	// WithHash is an option for Put which specifies the multihash settings to use
-	// when hashing the object. Default is mh.SHA2_256 (0x12).
-	// If mhLen is set to -1, default length for the hash will be used
-	WithHash(mhType uint64, mhLen int) options.BlockPutOption
-
 	// Get attempts to resolve the path and return a reader for data in the block
 	Get(context.Context, Path) (io.Reader, error)
 
@@ -40,10 +31,6 @@ type BlockAPI interface {
 	// will be returned
 	Rm(context.Context, Path, ...options.BlockRmOption) error
 
-	// WithForce is an option for Rm which, when set to true, will ignore
-	// non-existing blocks
-	WithForce(force bool) options.BlockRmOption
-
 	// Stat returns information on
 	Stat(context.Context, Path) (BlockStat, error)
 }
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 1635d71b1..f20c88f25 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -16,27 +16,9 @@ type DagAPI interface {
 	// "sha256" are used.
 	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (Path, error)
 
-	// WithInputEnc is an option for Put which specifies the input encoding of the
-	// data. Default is "json", most formats/codecs support "raw"
-	WithInputEnc(enc string) options.DagPutOption
-
-	// WithCodec is an option for Put which specifies the multicodec to use to
-	// serialize the object. Default is cid.DagCBOR (0x71)
-	WithCodec(codec uint64) options.DagPutOption
-
-	// WithHash is an option for Put which specifies the multihash settings to use
-	// when hashing the object. Default is based on the codec used
-	// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
-	// the hash will be used
-	WithHash(mhType uint64, mhLen int) options.DagPutOption
-
 	// Get attempts to resolve and get the node specified by the path
 	Get(ctx context.Context, path Path) (ipld.Node, error)
 
 	// Tree returns list of paths within a node specified by the path.
 	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
-
-	// WithDepth is an option for Tree which specifies maximum depth of the
-	// returned tree. Default is -1 (no depth limit)
-	WithDepth(depth int) options.DagTreeOption
 }
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 730e855d7..928aa265f 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -20,29 +20,10 @@ type KeyAPI interface {
 	// name and returns a base58 encoded multihash of it's public key
 	Generate(ctx context.Context, name string, opts ...options.KeyGenerateOption) (Key, error)
 
-	// WithType is an option for Generate which specifies which algorithm
-	// should be used for the key. Default is options.RSAKey
-	//
-	// Supported key types:
-	// * options.RSAKey
-	// * options.Ed25519Key
-	WithType(algorithm string) options.KeyGenerateOption
-
-	// WithSize is an option for Generate which specifies the size of the key to
-	// generated. Default is -1
-	//
-	// value of -1 means 'use default size for key type':
-	//  * 2048 for RSA
-	WithSize(size int) options.KeyGenerateOption
-
 	// Rename renames oldName key to newName. Returns the key and whether another
 	// key was overwritten, or an error
 	Rename(ctx context.Context, oldName string, newName string, opts ...options.KeyRenameOption) (Key, bool, error)
 
-	// WithForce is an option for Rename which specifies whether to allow to
-	// replace existing keys.
-	WithForce(force bool) options.KeyRenameOption
-
 	// List lists keys stored in keystore
 	List(ctx context.Context) ([]Key, error)
 
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 6d17d840a..a6aad0c3e 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -2,7 +2,6 @@ package iface
 
 import (
 	"context"
-	"time"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
@@ -27,29 +26,6 @@ type NameAPI interface {
 	// Publish announces new IPNS name
 	Publish(ctx context.Context, path Path, opts ...options.NamePublishOption) (IpnsEntry, error)
 
-	// WithValidTime is an option for Publish which specifies for how long the
-	// entry will remain valid. Default value is 24h
-	WithValidTime(validTime time.Duration) options.NamePublishOption
-
-	// WithKey is an option for Publish which specifies the key to use for
-	// publishing. Default value is "self" which is the node's own PeerID.
-	// The key parameter must be either PeerID or keystore key alias.
-	//
-	// You can use KeyAPI to list and generate more names and their respective keys.
-	WithKey(key string) options.NamePublishOption
-
 	// Resolve attempts to resolve the newest version of the specified name
 	Resolve(ctx context.Context, name string, opts ...options.NameResolveOption) (Path, error)
-
-	// WithRecursive is an option for Resolve which specifies whether to perform a
-	// recursive lookup. Default value is false
-	WithRecursive(recursive bool) options.NameResolveOption
-
-	// WithLocal is an option for Resolve which specifies if the lookup should be
-	// offline. Default value is false
-	WithLocal(local bool) options.NameResolveOption
-
-	// WithCache is an option for Resolve which specifies if cache should be used.
-	// Default value is true
-	WithCache(cache bool) options.NameResolveOption
 }
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 75837f93e..548b15a73 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -37,33 +37,9 @@ type ObjectAPI interface {
 	// New creates new, empty (by default) dag-node.
 	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
 
-	// WithType is an option for New which allows to change the type of created
-	// dag node.
-	//
-	// Supported types:
-	// * 'empty' - Empty node
-	// * 'unixfs-dir' - Empty UnixFS directory
-	WithType(string) options.ObjectNewOption
-
 	// Put imports the data into merkledag
 	Put(context.Context, io.Reader, ...options.ObjectPutOption) (Path, error)
 
-	// WithInputEnc is an option for Put which specifies the input encoding of the
-	// data. Default is "json".
-	//
-	// Supported encodings:
-	// * "protobuf"
-	// * "json"
-	WithInputEnc(e string) options.ObjectPutOption
-
-	// WithDataType specifies the encoding of data field when using Josn or XML
-	// input encoding.
-	//
-	// Supported types:
-	// * "text" (default)
-	// * "base64"
-	WithDataType(t string) options.ObjectPutOption
-
 	// Get returns the node for the path
 	Get(context.Context, Path) (ipld.Node, error)
 
@@ -81,10 +57,6 @@ type ObjectAPI interface {
 	// with WithCreate option).
 	AddLink(ctx context.Context, base Path, name string, child Path, opts ...options.ObjectAddLinkOption) (Path, error)
 
-	// WithCreate is an option for AddLink which specifies whether create required
-	// directories for the child
-	WithCreate(create bool) options.ObjectAddLinkOption
-
 	// RmLink removes a link from the node
 	RmLink(ctx context.Context, base Path, link string) (Path, error)
 
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index bbb14612f..20320705e 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -47,16 +47,23 @@ func BlockRmOptions(opts ...BlockRmOption) (*BlockRmSettings, error) {
 	return options, nil
 }
 
-type BlockOptions struct{}
+type blockOpts struct{}
 
-func (api *BlockOptions) WithFormat(codec string) BlockPutOption {
+var Block blockOpts
+
+// Format is an option for Block.Put which specifies the multicodec to use to
+// serialize the object. Default is "v0"
+func (_ blockOpts) Format(codec string) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
 		settings.Codec = codec
 		return nil
 	}
 }
 
-func (api *BlockOptions) WithHash(mhType uint64, mhLen int) BlockPutOption {
+// Hash is an option for Block.Put which specifies the multihash settings to use
+// when hashing the object. Default is mh.SHA2_256 (0x12).
+// If mhLen is set to -1, default length for the hash will be used
+func (_ blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
 		settings.MhType = mhType
 		settings.MhLength = mhLen
@@ -64,7 +71,9 @@ func (api *BlockOptions) WithHash(mhType uint64, mhLen int) BlockPutOption {
 	}
 }
 
-func (api *BlockOptions) WithForce(force bool) BlockRmOption {
+// Force is an option for Block.Rm which, when set to true, will ignore
+// non-existing blocks
+func (_ blockOpts) Force(force bool) BlockRmOption {
 	return func(settings *BlockRmSettings) error {
 		settings.Force = force
 		return nil
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index b56fcd81a..ec258cf95 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -51,23 +51,33 @@ func DagTreeOptions(opts ...DagTreeOption) (*DagTreeSettings, error) {
 	return options, nil
 }
 
-type DagOptions struct{}
+type dagOpts struct{}
 
-func (api *DagOptions) WithInputEnc(enc string) DagPutOption {
+var Dag dagOpts
+
+// InputEnc is an option for Dag.Put which specifies the input encoding of the
+// data. Default is "json", most formats/codecs support "raw"
+func (_ dagOpts) InputEnc(enc string) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.InputEnc = enc
 		return nil
 	}
 }
 
-func (api *DagOptions) WithCodec(codec uint64) DagPutOption {
+// Codec is an option for Dag.Put which specifies the multicodec to use to
+// serialize the object. Default is cid.DagCBOR (0x71)
+func (_ dagOpts) Codec(codec uint64) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.Codec = codec
 		return nil
 	}
 }
 
-func (api *DagOptions) WithHash(mhType uint64, mhLen int) DagPutOption {
+// Hash is an option for Dag.Put which specifies the multihash settings to use
+// when hashing the object. Default is based on the codec used
+// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
+// the hash will be used
+func (_ dagOpts) Hash(mhType uint64, mhLen int) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.MhType = mhType
 		settings.MhLength = mhLen
@@ -75,7 +85,9 @@ func (api *DagOptions) WithHash(mhType uint64, mhLen int) DagPutOption {
 	}
 }
 
-func (api *DagOptions) WithDepth(depth int) DagTreeOption {
+// Depth is an option for Dag.Tree which specifies maximum depth of the
+// returned tree. Default is -1 (no depth limit)
+func (_ dagOpts) Depth(depth int) DagTreeOption {
 	return func(settings *DagTreeSettings) error {
 		settings.Depth = depth
 		return nil
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index 114361875..a29261d14 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -48,23 +48,38 @@ func KeyRenameOptions(opts ...KeyRenameOption) (*KeyRenameSettings, error) {
 	return options, nil
 }
 
-type KeyOptions struct{}
+type keyOpts struct{}
 
-func (api *KeyOptions) WithType(algorithm string) KeyGenerateOption {
+var Key keyOpts
+
+// Type is an option for Key.Generate which specifies which algorithm
+// should be used for the key. Default is options.RSAKey
+//
+// Supported key types:
+// * options.RSAKey
+// * options.Ed25519Key
+func (_ keyOpts) Type(algorithm string) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Algorithm = algorithm
 		return nil
 	}
 }
 
-func (api *KeyOptions) WithSize(size int) KeyGenerateOption {
+// Size is an option for Key.Generate which specifies the size of the key to
+// generated. Default is -1
+//
+// value of -1 means 'use default size for key type':
+//  * 2048 for RSA
+func (_ keyOpts) Size(size int) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Size = size
 		return nil
 	}
 }
 
-func (api *KeyOptions) WithForce(force bool) KeyRenameOption {
+// Force is an option for Key.Rename which specifies whether to allow to
+// replace existing keys.
+func (_ keyOpts) Force(force bool) KeyRenameOption {
 	return func(settings *KeyRenameSettings) error {
 		settings.Force = force
 		return nil
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 9f8aaafc8..1f6de0ee3 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -55,37 +55,52 @@ func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error)
 	return options, nil
 }
 
-type NameOptions struct{}
+type nameOpts struct{}
 
-func (api *NameOptions) WithValidTime(validTime time.Duration) NamePublishOption {
+var Name nameOpts
+
+// ValidTime is an option for Name.Publish which specifies for how long the
+// entry will remain valid. Default value is 24h
+func (_ nameOpts) ValidTime(validTime time.Duration) NamePublishOption {
 	return func(settings *NamePublishSettings) error {
 		settings.ValidTime = validTime
 		return nil
 	}
 }
 
-func (api *NameOptions) WithKey(key string) NamePublishOption {
+// Key is an option for Name.Publish which specifies the key to use for
+// publishing. Default value is "self" which is the node's own PeerID.
+// The key parameter must be either PeerID or keystore key alias.
+//
+// You can use KeyAPI to list and generate more names and their respective keys.
+func (_ nameOpts) Key(key string) NamePublishOption {
 	return func(settings *NamePublishSettings) error {
 		settings.Key = key
 		return nil
 	}
 }
 
-func (api *NameOptions) WithRecursive(recursive bool) NameResolveOption {
+// Recursive is an option for Name.Resolve which specifies whether to perform a
+// recursive lookup. Default value is false
+func (_ nameOpts) Recursive(recursive bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Recursive = recursive
 		return nil
 	}
 }
 
-func (api *NameOptions) WithLocal(local bool) NameResolveOption {
+// Local is an option for Name.Resolve which specifies if the lookup should be
+// offline. Default value is false
+func (_ nameOpts) Local(local bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Local = local
 		return nil
 	}
 }
 
-func (api *NameOptions) WithCache(cache bool) NameResolveOption {
+// Cache is an option for Name.Resolve which specifies if cache should be used.
+// Default value is true
+func (_ nameOpts) Cache(cache bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Cache = cache
 		return nil
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index 9c8c9a9dd..00e41d28b 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -60,30 +60,52 @@ func ObjectAddLinkOptions(opts ...ObjectAddLinkOption) (*ObjectAddLinkSettings,
 	return options, nil
 }
 
-type ObjectOptions struct{}
+type objectOpts struct{}
 
-func (api *ObjectOptions) WithType(t string) ObjectNewOption {
+var Object objectOpts
+
+// Type is an option for Object.New which allows to change the type of created
+// dag node.
+//
+// Supported types:
+// * 'empty' - Empty node
+// * 'unixfs-dir' - Empty UnixFS directory
+func (_ objectOpts) Type(t string) ObjectNewOption {
 	return func(settings *ObjectNewSettings) error {
 		settings.Type = t
 		return nil
 	}
 }
 
-func (api *ObjectOptions) WithInputEnc(e string) ObjectPutOption {
+// InputEnc is an option for Object.Put which specifies the input encoding of the
+// data. Default is "json".
+//
+// Supported encodings:
+// * "protobuf"
+// * "json"
+func (_ objectOpts) InputEnc(e string) ObjectPutOption {
 	return func(settings *ObjectPutSettings) error {
 		settings.InputEnc = e
 		return nil
 	}
 }
 
-func (api *ObjectOptions) WithDataType(t string) ObjectPutOption {
+// DataType is an option for Object.Put which specifies the encoding of data
+// field when using Json or XML input encoding.
+//
+// Supported types:
+// * "text" (default)
+// * "base64"
+func (_ objectOpts) DataType(t string) ObjectPutOption {
 	return func(settings *ObjectPutSettings) error {
 		settings.DataType = t
 		return nil
 	}
 }
 
-func (api *ObjectOptions) WithCreate(create bool) ObjectAddLinkOption {
+// Create is an option for Object.AddLink which specifies whether create required
+// directories for the child
+func (_ objectOpts) Create(create bool) ObjectAddLinkOption {
 	return func(settings *ObjectAddLinkSettings) error {
 		settings.Create = create
 		return nil
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index f97f7b16e..680ed391d 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -61,23 +61,38 @@ func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
 	return options, nil
 }
 
-type PinOptions struct{}
+type pinOpts struct{}
 
-func (api *PinOptions) WithRecursive(recucsive bool) PinAddOption {
+var Pin pinOpts
+
+// Recursive is an option for Pin.Add which specifies whether to pin an entire
+// object tree or just one object. Default: true
+func (_ pinOpts) Recursive(recucsive bool) PinAddOption {
 	return func(settings *PinAddSettings) error {
 		settings.Recursive = recucsive
 		return nil
 	}
 }
 
-func (api *PinOptions) WithType(t string) PinLsOption {
+// Type is an option for Pin.Ls which allows to specify which pin types should
+// be returned
+//
+// Supported values:
+// * "direct" - directly pinned objects
+// * "recursive" - roots of recursive pins
+// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+//    objects)
+// * "all" - all pinned objects (default)
+func (_ pinOpts) Type(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
 		return nil
 	}
 }
 
-func (api *PinOptions) WithUnpin(unpin bool) PinUpdateOption {
+// Unpin is an option for Pin.Update which specifies whether to remove the old pin.
+// Default is true.
+func (_ pinOpts) Unpin(unpin bool) PinUpdateOption {
 	return func(settings *PinUpdateSettings) error {
 		settings.Unpin = unpin
 		return nil
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 47a5a0bb2..5994c7586 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -39,24 +39,9 @@ type PinAPI interface {
 	// tree
 	Add(context.Context, Path, ...options.PinAddOption) error
 
-	// WithRecursive is an option for Add which specifies whether to pin an entire
-	// object tree or just one object. Default: true
-	WithRecursive(bool) options.PinAddOption
-
 	// Ls returns list of pinned objects on this node
 	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
 
-	// WithType is an option for Ls which allows to specify which pin types should
-	// be returned
-	//
-	// Supported values:
-	// * "direct" - directly pinned objects
-	// * "recursive" - roots of recursive pins
-	// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-	//    objects)
-	// * "all" - all pinned objects (default)
-	WithType(string) options.PinLsOption
-
 	// Rm removes pin for object specified by the path
 	Rm(context.Context, Path) error
 

From 8fea8513e3acbd23258c873a02808daf62ced490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 25 Mar 2018 13:58:29 +0200
Subject: [PATCH 046/247] coreapi: use defined functions for pin type option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@2e3f9758c88ce4572922c3fd4e8ef51c703e183d

This commit was moved from ipfs/boxo@8a0f4029598ebf3be0d56e91fe07675702349a6d
---
 core/coreiface/options/pin.go | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 680ed391d..7cb4d09d2 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -61,10 +61,38 @@ func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
 	return options, nil
 }
 
-type pinOpts struct{}
+type pinType struct{}
+
+type pinOpts struct {
+	Type pinType
+}
 
 var Pin pinOpts
 
+// All is an option for Pin.Ls which will make it return all pins. It is
+// the default
+func (_ pinType) All() PinLsOption {
+	return Pin.pinType("all")
+}
+
+// Recursive is an option for Pin.Ls which will make it only return recursive
+// pins
+func (_ pinType) Recursive() PinLsOption {
+	return Pin.pinType("recursive")
+}
+
+// Direct is an option for Pin.Ls which will make it only return direct (non
+// recursive) pins
+func (_ pinType) Direct() PinLsOption {
+	return Pin.pinType("direct")
+}
+
+// Indirect is an option for Pin.Ls which will make it only return indirect pins
+// (objects referenced by other recursively pinned objects)
+func (_ pinType) Indirect() PinLsOption {
+	return Pin.pinType("indirect")
+}
+
 // Recursive is an option for Pin.Add which specifies whether to pin an entire
 // object tree or just one object. Default: true
 func (_ pinOpts) Recursive(recucsive bool) PinAddOption {
@@ -83,7 +111,7 @@ func (_ pinOpts) Recursive(recucsive bool) PinAddOption {
 // * "indirect" - indirectly pinned objects (referenced by recursively pinned
 //    objects)
 // * "all" - all pinned objects (default)
-func (_ pinOpts) Type(t string) PinLsOption {
+func (_ pinOpts) pinType(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
 		return nil

From b5d36c8a1b2d8477021f4a7c3b044bfc5913e173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 25 Mar 2018 14:09:59 +0200
Subject: [PATCH 047/247] coreapi: don't use underscores in opt reciever funcs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8b65fc5e1ed16902cda0e3e36fe624b01856b182

This commit was moved from ipfs/boxo@6bd3ea5ab8c0df771963b4f8a9f5cfdc18a95b6d
---
 core/coreiface/options/block.go  |  6 +++---
 core/coreiface/options/dag.go    |  8 ++++----
 core/coreiface/options/key.go    |  6 +++---
 core/coreiface/options/name.go   | 10 +++++-----
 core/coreiface/options/object.go |  8 ++++----
 core/coreiface/options/pin.go    | 14 +++++++-------
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 20320705e..55964b2b7 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -53,7 +53,7 @@ var Block blockOpts
 
 // Format is an option for Block.Put which specifies the multicodec to use to
 // serialize the object. Default is "v0"
-func (_ blockOpts) Format(codec string) BlockPutOption {
+func (blockOpts) Format(codec string) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
 		settings.Codec = codec
 		return nil
@@ -63,7 +63,7 @@ func (_ blockOpts) Format(codec string) BlockPutOption {
 // Hash is an option for Block.Put which specifies the multihash settings to use
 // when hashing the object. Default is mh.SHA2_256 (0x12).
 // If mhLen is set to -1, default length for the hash will be used
-func (_ blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
+func (blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
 		settings.MhType = mhType
 		settings.MhLength = mhLen
@@ -73,7 +73,7 @@ func (_ blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
 
 // Force is an option for Block.Rm which, when set to true, will ignore
 // non-existing blocks
-func (_ blockOpts) Force(force bool) BlockRmOption {
+func (blockOpts) Force(force bool) BlockRmOption {
 	return func(settings *BlockRmSettings) error {
 		settings.Force = force
 		return nil
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index ec258cf95..96eea5b46 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -57,7 +57,7 @@ var Dag dagOpts
 
 // InputEnc is an option for Dag.Put which specifies the input encoding of the
 // data. Default is "json", most formats/codecs support "raw"
-func (_ dagOpts) InputEnc(enc string) DagPutOption {
+func (dagOpts) InputEnc(enc string) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.InputEnc = enc
 		return nil
@@ -66,7 +66,7 @@ func (_ dagOpts) InputEnc(enc string) DagPutOption {
 
 // Codec is an option for Dag.Put which specifies the multicodec to use to
 // serialize the object. Default is cid.DagCBOR (0x71)
-func (_ dagOpts) Codec(codec uint64) DagPutOption {
+func (dagOpts) Codec(codec uint64) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.Codec = codec
 		return nil
@@ -77,7 +77,7 @@ func (_ dagOpts) Codec(codec uint64) DagPutOption {
 // when hashing the object. Default is based on the codec used
 // (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
 // the hash will be used
-func (_ dagOpts) Hash(mhType uint64, mhLen int) DagPutOption {
+func (dagOpts) Hash(mhType uint64, mhLen int) DagPutOption {
 	return func(settings *DagPutSettings) error {
 		settings.MhType = mhType
 		settings.MhLength = mhLen
@@ -87,7 +87,7 @@ func (_ dagOpts) Hash(mhType uint64, mhLen int) DagPutOption {
 
 // Depth is an option for Dag.Tree which specifies maximum depth of the
 // returned tree. Default is -1 (no depth limit)
-func (_ dagOpts) Depth(depth int) DagTreeOption {
+func (dagOpts) Depth(depth int) DagTreeOption {
 	return func(settings *DagTreeSettings) error {
 		settings.Depth = depth
 		return nil
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index a29261d14..80beea352 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -58,7 +58,7 @@ var Key keyOpts
 // Supported key types:
 // * options.RSAKey
 // * options.Ed25519Key
-func (_ keyOpts) Type(algorithm string) KeyGenerateOption {
+func (keyOpts) Type(algorithm string) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Algorithm = algorithm
 		return nil
@@ -70,7 +70,7 @@ func (_ keyOpts) Type(algorithm string) KeyGenerateOption {
 //
 // value of -1 means 'use default size for key type':
 //  * 2048 for RSA
-func (_ keyOpts) Size(size int) KeyGenerateOption {
+func (keyOpts) Size(size int) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Size = size
 		return nil
@@ -79,7 +79,7 @@ func (_ keyOpts) Size(size int) KeyGenerateOption {
 
 // Force is an option for Key.Rename which specifies whether to allow to
 // replace existing keys.
-func (_ keyOpts) Force(force bool) KeyRenameOption {
+func (keyOpts) Force(force bool) KeyRenameOption {
 	return func(settings *KeyRenameSettings) error {
 		settings.Force = force
 		return nil
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 1f6de0ee3..48aecf18b 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -61,7 +61,7 @@ var Name nameOpts
 
 // ValidTime is an option for Name.Publish which specifies for how long the
 // entry will remain valid. Default value is 24h
-func (_ nameOpts) ValidTime(validTime time.Duration) NamePublishOption {
+func (nameOpts) ValidTime(validTime time.Duration) NamePublishOption {
 	return func(settings *NamePublishSettings) error {
 		settings.ValidTime = validTime
 		return nil
@@ -73,7 +73,7 @@ func (_ nameOpts) ValidTime(validTime time.Duration) NamePublishOption {
 // The key parameter must be either PeerID or keystore key alias.
 //
 // You can use KeyAPI to list and generate more names and their respective keys.
-func (_ nameOpts) Key(key string) NamePublishOption {
+func (nameOpts) Key(key string) NamePublishOption {
 	return func(settings *NamePublishSettings) error {
 		settings.Key = key
 		return nil
@@ -82,7 +82,7 @@ func (_ nameOpts) Key(key string) NamePublishOption {
 
 // Recursive is an option for Name.Resolve which specifies whether to perform a
 // recursive lookup. Default value is false
-func (_ nameOpts) Recursive(recursive bool) NameResolveOption {
+func (nameOpts) Recursive(recursive bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Recursive = recursive
 		return nil
@@ -91,7 +91,7 @@ func (_ nameOpts) Recursive(recursive bool) NameResolveOption {
 
 // Local is an option for Name.Resolve which specifies if the lookup should be
 // offline. Default value is false
-func (_ nameOpts) Local(local bool) NameResolveOption {
+func (nameOpts) Local(local bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Local = local
 		return nil
@@ -100,7 +100,7 @@ func (_ nameOpts) Local(local bool) NameResolveOption {
 
 // Cache is an option for Name.Resolve which specifies if cache should be used.
 // Default value is true
-func (_ nameOpts) Cache(cache bool) NameResolveOption {
+func (nameOpts) Cache(cache bool) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.Cache = cache
 		return nil
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index 00e41d28b..aca02d672 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -70,7 +70,7 @@ var Object objectOpts
 // Supported types:
 // * 'empty' - Empty node
 // * 'unixfs-dir' - Empty UnixFS directory
-func (_ objectOpts) Type(t string) ObjectNewOption {
+func (objectOpts) Type(t string) ObjectNewOption {
 	return func(settings *ObjectNewSettings) error {
 		settings.Type = t
 		return nil
@@ -83,7 +83,7 @@ func (_ objectOpts) Type(t string) ObjectNewOption {
 // Supported encodings:
 // * "protobuf"
 // * "json"
-func (_ objectOpts) InputEnc(e string) ObjectPutOption {
+func (objectOpts) InputEnc(e string) ObjectPutOption {
 	return func(settings *ObjectPutSettings) error {
 		settings.InputEnc = e
 		return nil
@@ -96,7 +96,7 @@ func (_ objectOpts) InputEnc(e string) ObjectPutOption {
 // Supported types:
 // * "text" (default)
 // * "base64"
-func (_ objectOpts) DataType(t string) ObjectPutOption {
+func (objectOpts) DataType(t string) ObjectPutOption {
 	return func(settings *ObjectPutSettings) error {
 		settings.DataType = t
 		return nil
@@ -105,7 +105,7 @@ func (_ objectOpts) DataType(t string) ObjectPutOption {
 
 // Create is an option for Object.AddLink which specifies whether create required
 // directories for the child
-func (_ objectOpts) Create(create bool) ObjectAddLinkOption {
+func (objectOpts) Create(create bool) ObjectAddLinkOption {
 	return func(settings *ObjectAddLinkSettings) error {
 		settings.Create = create
 		return nil
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 7cb4d09d2..e46c27246 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -71,31 +71,31 @@ var Pin pinOpts
 
 // All is an option for Pin.Ls which will make it return all pins. It is
 // the default
-func (_ pinType) All() PinLsOption {
+func (pinType) All() PinLsOption {
 	return Pin.pinType("all")
 }
 
 // Recursive is an option for Pin.Ls which will make it only return recursive
 // pins
-func (_ pinType) Recursive() PinLsOption {
+func (pinType) Recursive() PinLsOption {
 	return Pin.pinType("recursive")
 }
 
 // Direct is an option for Pin.Ls which will make it only return direct (non
 // recursive) pins
-func (_ pinType) Direct() PinLsOption {
+func (pinType) Direct() PinLsOption {
 	return Pin.pinType("direct")
 }
 
 // Indirect is an option for Pin.Ls which will make it only return indirect pins
 // (objects referenced by other recursively pinned objects)
-func (_ pinType) Indirect() PinLsOption {
+func (pinType) Indirect() PinLsOption {
 	return Pin.pinType("indirect")
 }
 
 // Recursive is an option for Pin.Add which specifies whether to pin an entire
 // object tree or just one object. Default: true
-func (_ pinOpts) Recursive(recucsive bool) PinAddOption {
+func (pinOpts) Recursive(recucsive bool) PinAddOption {
 	return func(settings *PinAddSettings) error {
 		settings.Recursive = recucsive
 		return nil
@@ -111,7 +111,7 @@ func (_ pinOpts) Recursive(recucsive bool) PinAddOption {
 // * "indirect" - indirectly pinned objects (referenced by recursively pinned
 //    objects)
 // * "all" - all pinned objects (default)
-func (_ pinOpts) pinType(t string) PinLsOption {
+func (pinOpts) pinType(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
 		return nil
@@ -120,7 +120,7 @@ func (_ pinOpts) pinType(t string) PinLsOption {
 
 // Unpin is an option for Pin.Update which specifies whether to remove the old pin.
 // Default is true.
-func (_ pinOpts) Unpin(unpin bool) PinUpdateOption {
+func (pinOpts) Unpin(unpin bool) PinUpdateOption {
 	return func(settings *PinUpdateSettings) error {
 		settings.Unpin = unpin
 		return nil

From 7ffe2f640d3ee26d8aee1f418f1e7c805478fafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 19 Mar 2018 03:41:28 +0100
Subject: [PATCH 048/247] misc: Fix a few typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@646b14412abd5b2382fc11f37e40ef592c557fcb

This commit was moved from ipfs/boxo@76ac2a8842d68a73acece177235ec746ca637793
---
 core/coreiface/options/pin.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index e46c27246..9d1107f92 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -95,9 +95,9 @@ func (pinType) Indirect() PinLsOption {
 
 // Recursive is an option for Pin.Add which specifies whether to pin an entire
 // object tree or just one object. Default: true
-func (pinOpts) Recursive(recucsive bool) PinAddOption {
+func (pinOpts) Recursive(recursive bool) PinAddOption {
 	return func(settings *PinAddSettings) error {
-		settings.Recursive = recucsive
+		settings.Recursive = recursive
 		return nil
 	}
 }

From 557277dda8b6c276d95f9fcec7721c014c60b5ee Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 8 Jun 2018 22:01:00 -0700
Subject: [PATCH 049/247] gx update go-log, sys, go-crypto

* go-log
* sys
* go-crypto

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@0e613d93eacb5247a4ca23790a5fe82dde8917dc

This commit was moved from ipfs/boxo@724c6143570accc8e163cc355b46eff0338f52e5
---
 core/coreiface/coreapi.go       | 2 +-
 core/coreiface/dag.go           | 2 +-
 core/coreiface/object.go        | 4 ++--
 core/coreiface/options/block.go | 2 +-
 core/coreiface/options/dag.go   | 2 +-
 core/coreiface/path.go          | 2 +-
 core/coreiface/unixfs.go        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 9428b3b63..220f8df50 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index f20c88f25..3c4dc0c3a 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
 )
 
 // DagAPI specifies the interface to IPLD
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 548b15a73..d53f4d214 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
-	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
+	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 55964b2b7..d6da99774 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
+	"gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 )
 
 type BlockPutSettings struct {
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index 96eea5b46..b5e6dcea1 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
+	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index b2160b942..929b97bcd 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
+	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 )
 
 // Path is a generic wrapper for paths used in the API. A path can be resolved
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index c1b4efa43..11e14cc84 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
+	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From 7ffcd2a1be865e92ce369998a9a8147f45ce7e5c Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 16 Jul 2018 15:16:49 -0700
Subject: [PATCH 050/247] update go-cid

alternative to #5243 that updates go-cid and all packages that depend on it

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@2c9291a232cb0febaf3bb029694ce2fb3155d3f9

This commit was moved from ipfs/boxo@c77c8df70d4c804e1f3acd068a8ef58937e7ef9e
---
 core/coreiface/coreapi.go     | 2 +-
 core/coreiface/dag.go         | 2 +-
 core/coreiface/object.go      | 4 ++--
 core/coreiface/options/dag.go | 2 +-
 core/coreiface/path.go        | 2 +-
 core/coreiface/unixfs.go      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 220f8df50..a77ad6367 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
+	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 3c4dc0c3a..158db7419 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
+	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
 // DagAPI specifies the interface to IPLD
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index d53f4d214..a18a38ebe 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
-	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
+	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
+	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index b5e6dcea1..57465deee 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
+	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 929b97bcd..51513772f 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
+	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )
 
 // Path is a generic wrapper for paths used in the API. A path can be resolved
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 11e14cc84..c59451d00 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/QmWi2BYBL5gJ3CiAiQchg6rn1A8iBsrWy51EYxvHVjFvLb/go-ipld-format"
+	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From 63e861e549469348c5b075da5920df32c12689b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 2 Feb 2018 16:00:37 +0100
Subject: [PATCH 051/247] coreapi: expand public path api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ad6db2fc4cff3178bb50aacbe30559078661907b

This commit was moved from ipfs/boxo@3b1cf7aed3af88561e5b851f79d4b480c59d1ce5
---
 core/coreiface/coreapi.go      | 13 +++++++++++++
 core/coreiface/options/path.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 core/coreiface/options/path.go

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index a77ad6367..179531352 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,6 +5,9 @@ package iface
 import (
 	"context"
 
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
@@ -37,4 +40,14 @@ type CoreAPI interface {
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
 	ResolveNode(context.Context, Path) (ipld.Node, error)
+
+	// ParsePath parses string path to a Path
+	ParsePath(context.Context, string, ...options.ParsePathOption) (Path, error)
+
+	// WithResolve is an option for ParsePath which when set to true tells
+	// ParsePath to also resolve the path
+	WithResolve(bool) options.ParsePathOption
+
+	// ParseCid creates new path from the provided CID
+	ParseCid(*cid.Cid) Path
 }
diff --git a/core/coreiface/options/path.go b/core/coreiface/options/path.go
new file mode 100644
index 000000000..bf6eed65b
--- /dev/null
+++ b/core/coreiface/options/path.go
@@ -0,0 +1,30 @@
+package options
+
+type ParsePathSettings struct {
+	Resolve bool
+}
+
+type ParsePathOption func(*ParsePathSettings) error
+
+func ParsePathOptions(opts ...ParsePathOption) (*ParsePathSettings, error) {
+	options := &ParsePathSettings{
+		Resolve: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type ApiOptions struct{}
+
+func (api *ApiOptions) WithResolve(r bool) ParsePathOption {
+	return func(settings *ParsePathSettings) error {
+		settings.Resolve = r
+		return nil
+	}
+}

From 161503c26f9fdc99045fc10d731bb8036769e390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 8 Feb 2018 17:39:05 +0100
Subject: [PATCH 052/247] coreapi: separate path into two types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@79875b01300b77c8437ec0ca1b22d497edb79cd9

This commit was moved from ipfs/boxo@5a61226d830993d09c7d76d970b1c5a9de94f834
---
 core/coreiface/block.go        |  4 ++--
 core/coreiface/coreapi.go      | 14 ++++----------
 core/coreiface/dag.go          |  2 +-
 core/coreiface/object.go       | 10 +++++-----
 core/coreiface/options/path.go | 30 ------------------------------
 core/coreiface/path.go         | 15 +++++++++++++--
 core/coreiface/pin.go          |  4 ++--
 core/coreiface/unixfs.go       |  2 +-
 8 files changed, 28 insertions(+), 53 deletions(-)
 delete mode 100644 core/coreiface/options/path.go

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index a9e577d76..468c00947 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -13,13 +13,13 @@ type BlockStat interface {
 	Size() int
 
 	// Path returns path to the block
-	Path() Path
+	Path() ResolvedPath
 }
 
 // BlockAPI specifies the interface to the block layer
 type BlockAPI interface {
 	// Put imports raw block data, hashing it using specified settings.
-	Put(context.Context, io.Reader, ...options.BlockPutOption) (Path, error)
+	Put(context.Context, io.Reader, ...options.BlockPutOption) (ResolvedPath, error)
 
 	// Get attempts to resolve the path and return a reader for data in the block
 	Get(context.Context, Path) (io.Reader, error)
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 179531352..615b039b3 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,10 +5,8 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-
-	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
+	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
@@ -35,19 +33,15 @@ type CoreAPI interface {
 	Object() ObjectAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
-	ResolvePath(context.Context, Path) (Path, error)
+	ResolvePath(context.Context, 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)
 
 	// ParsePath parses string path to a Path
-	ParsePath(context.Context, string, ...options.ParsePathOption) (Path, error)
-
-	// WithResolve is an option for ParsePath which when set to true tells
-	// ParsePath to also resolve the path
-	WithResolve(bool) options.ParsePathOption
+	ParsePath(context.Context, string) (Path, error)
 
 	// ParseCid creates new path from the provided CID
-	ParseCid(*cid.Cid) Path
+	ParseCid(*cid.Cid) ResolvedPath
 }
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 158db7419..3f92ebab3 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -14,7 +14,7 @@ type DagAPI interface {
 	// Put inserts data using specified format and input encoding.
 	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
 	// "sha256" are used.
-	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (Path, error)
+	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (ResolvedPath, error)
 
 	// Get attempts to resolve and get the node specified by the path
 	Get(ctx context.Context, path Path) (ipld.Node, error)
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index a18a38ebe..ea9aa5948 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -38,7 +38,7 @@ type ObjectAPI interface {
 	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
 
 	// Put imports the data into merkledag
-	Put(context.Context, io.Reader, ...options.ObjectPutOption) (Path, error)
+	Put(context.Context, io.Reader, ...options.ObjectPutOption) (ResolvedPath, error)
 
 	// Get returns the node for the path
 	Get(context.Context, Path) (ipld.Node, error)
@@ -55,14 +55,14 @@ type ObjectAPI interface {
 	// 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) (Path, error)
+	AddLink(ctx context.Context, base Path, name string, child Path, opts ...options.ObjectAddLinkOption) (ResolvedPath, error)
 
 	// RmLink removes a link from the node
-	RmLink(ctx context.Context, base Path, link string) (Path, error)
+	RmLink(ctx context.Context, base Path, link string) (ResolvedPath, error)
 
 	// AppendData appends data to the node
-	AppendData(context.Context, Path, io.Reader) (Path, error)
+	AppendData(context.Context, Path, io.Reader) (ResolvedPath, error)
 
 	// SetData sets the data contained in the node
-	SetData(context.Context, Path, io.Reader) (Path, error)
+	SetData(context.Context, Path, io.Reader) (ResolvedPath, error)
 }
diff --git a/core/coreiface/options/path.go b/core/coreiface/options/path.go
deleted file mode 100644
index bf6eed65b..000000000
--- a/core/coreiface/options/path.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package options
-
-type ParsePathSettings struct {
-	Resolve bool
-}
-
-type ParsePathOption func(*ParsePathSettings) error
-
-func ParsePathOptions(opts ...ParsePathOption) (*ParsePathSettings, error) {
-	options := &ParsePathSettings{
-		Resolve: false,
-	}
-
-	for _, opt := range opts {
-		err := opt(options)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return options, nil
-}
-
-type ApiOptions struct{}
-
-func (api *ApiOptions) WithResolve(r bool) ParsePathOption {
-	return func(settings *ParsePathSettings) error {
-		settings.Resolve = r
-		return nil
-	}
-}
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 51513772f..4cfd916de 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -6,13 +6,24 @@ import (
 
 // Path is a generic wrapper for paths used in the API. A path can be resolved
 // to a CID using one of Resolve functions in the API.
+// TODO: figure out/explain namespaces
 type Path interface {
 	// String returns the path as a string.
 	String() string
+
+	// Namespace returns the first component of the path
+	Namespace() string
+}
+
+// ResolvedPath is a resolved Path
+type ResolvedPath interface {
 	// Cid returns cid referred to by path
 	Cid() *cid.Cid
+
 	// Root returns cid of root path
 	Root() *cid.Cid
-	// Resolved returns whether path has been fully resolved
-	Resolved() bool
+
+	//TODO: Path remainder
+
+	Path
 }
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 5994c7586..2e119cbea 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -9,7 +9,7 @@ import (
 // Pin holds information about pinned resource
 type Pin interface {
 	// Path to the pinned object
-	Path() Path
+	Path() ResolvedPath
 
 	// Type of the pin
 	Type() string
@@ -27,7 +27,7 @@ type PinStatus interface {
 // BadPinNode is a node that has been marked as bad by Pin.Verify
 type BadPinNode interface {
 	// Path is the path of the node
-	Path() Path
+	Path() ResolvedPath
 
 	// Err is the reason why the node has been marked as bad
 	Err() error
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index c59451d00..1ddc20674 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -10,7 +10,7 @@ import (
 // UnixfsAPI is the basic interface to immutable files in IPFS
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.Reader) (Path, error)
+	Add(context.Context, io.Reader) (ResolvedPath, error)
 
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)

From fd3e7b365a6752016b836ab1dd1eef45580522cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 30 Mar 2018 22:21:57 +0200
Subject: [PATCH 053/247] coreapi: remove ctx from ParsePath, split ParseCid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e4a333226c4cff7d76082700c14391133af6a7e5

This commit was moved from ipfs/boxo@38520ef87802adf0c77aaece8cc9d203b65461d5
---
 core/coreiface/coreapi.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 615b039b3..f5e81adce 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -40,8 +40,11 @@ type CoreAPI interface {
 	ResolveNode(context.Context, Path) (ipld.Node, error)
 
 	// ParsePath parses string path to a Path
-	ParsePath(context.Context, string) (Path, error)
+	ParsePath(string) (Path, error)
 
-	// ParseCid creates new path from the provided CID
-	ParseCid(*cid.Cid) ResolvedPath
+	// IpfsPath creates new /ipfs path from the provided CID
+	IpfsPath(*cid.Cid) ResolvedPath
+
+	// IpldPath creates new /ipld path from the provided CID
+	IpldPath(*cid.Cid) ResolvedPath
 }

From 2aed59e080591ca0e2a41feb5e011332340cf965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 30 Mar 2018 22:44:23 +0200
Subject: [PATCH 054/247] coreapi: path.Mutable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@bbff408d0ee7a756bce56956d0e72f0a3df6bbbc

This commit was moved from ipfs/boxo@620bec8b444b2c41107a2aa8a0ed39062be3b877
---
 core/coreiface/path.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 4cfd916de..bb87a6b3b 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -6,13 +6,25 @@ import (
 
 // Path is a generic wrapper for paths used in the API. A path can be resolved
 // to a CID using one of Resolve functions in the API.
-// TODO: figure out/explain namespaces
+//
+// Paths must be prefixed with a valid prefix:
+//
+// * /ipfs - Immutable unixfs path (files)
+// * /ipld - Immutable ipld path (data)
+// * /ipns - Mutable names. Usually resolves to one of the immutable paths
+//TODO: /local (MFS)
 type Path interface {
 	// String returns the path as a string.
 	String() string
 
 	// Namespace returns the first component of the path
 	Namespace() string
+
+	// Mutable returns false if the data pointed to by this path in guaranteed
+	// to not change.
+	//
+	// Note that resolved mutable path can be immutable.
+	Mutable() bool
 }
 
 // ResolvedPath is a resolved Path

From 16ea6d13bacead469e49ea8135fc5d42342626fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 3 Apr 2018 14:49:33 +0200
Subject: [PATCH 055/247] coreapi: path remainders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a6d0272a575722dbaef8c21c869e7625692fe7f6

This commit was moved from ipfs/boxo@d0da662cf78f21d6e3d170b11e33da14444f838b
---
 core/coreiface/path.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index bb87a6b3b..b4a9f0dbd 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -29,13 +29,14 @@ type Path interface {
 
 // ResolvedPath is a resolved Path
 type ResolvedPath interface {
-	// Cid returns cid referred to by path
+	// Cid returns the CID referred to by path
 	Cid() *cid.Cid
 
-	// Root returns cid of root path
+	// Root returns the CID of root path
 	Root() *cid.Cid
 
-	//TODO: Path remainder
+	// Remainder returns unresolved part of the path
+	Remainder() string
 
 	Path
 }

From 06f1d1a19a8863b41d9e9d7095ba00333be49598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 20 Apr 2018 13:56:33 +0200
Subject: [PATCH 056/247] coreapi: add more docs for path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@5abaad9e8573557e0bd7f3b1b45838053a85ffd7

This commit was moved from ipfs/boxo@d1d67409e744a2a697a3c05de0eb34b0bfbed175
---
 core/coreiface/path.go | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index b4a9f0dbd..d233afae5 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -17,7 +17,9 @@ type Path interface {
 	// String returns the path as a string.
 	String() string
 
-	// Namespace returns the first component of the path
+	// Namespace returns the first component of the path.
+	//
+	// For example path "/ipfs/QmHash", calling Namespace() will return "ipfs"
 	Namespace() string
 
 	// Mutable returns false if the data pointed to by this path in guaranteed
@@ -29,13 +31,29 @@ type Path interface {
 
 // ResolvedPath is a resolved Path
 type ResolvedPath interface {
-	// Cid returns the CID referred to by path
+	// Cid returns the CID of the object referenced by the path.
+	//
+	// Example:
+	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
+	// "/ipfs/QmRoot/A/B", the Cid method will return the CID of object B
 	Cid() *cid.Cid
 
-	// Root returns the CID of root path
+	// Root returns the CID of the root object of the path
+	//
+	// Example:
+	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
+	// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
 	Root() *cid.Cid
 
 	// Remainder returns unresolved part of the path
+	//
+	// Example:
+	// If you have 2 linked objects: QmRoot -> A, where A is a CBOR node
+	// containing the following data:
+	//
+	// {"foo": {"bar": 42}}
+	//
+	// When resolving "/ipld/QmRoot/A/foo/bar", Remainder will return "foo/bar"
 	Remainder() string
 
 	Path

From 70be3f394ba397728f5f31d4a4f2caf4d6c53af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 12 Jun 2018 02:57:57 +0200
Subject: [PATCH 057/247] coreapi: more docs for ResolvedPath
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1806f0f94a444c88f0c842e03a454619e6d42e56

This commit was moved from ipfs/boxo@88c3a9e6cc05757813f6a3266244543529c58cf6
---
 core/coreiface/path.go | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index d233afae5..acdcd85da 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -29,13 +29,38 @@ type Path interface {
 	Mutable() bool
 }
 
-// ResolvedPath is a resolved Path
+// ResolvedPath is a path which was resolved to the last resolvable node
 type ResolvedPath interface {
-	// Cid returns the CID of the object referenced by the path.
+	// Cid returns the CID of the node referenced by the path. Remainder of the
+	// path is guaranteed to be within the node.
 	//
-	// Example:
-	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
-	// "/ipfs/QmRoot/A/B", the Cid method will return the CID of object B
+	// Examples:
+	// If you have 3 linked objects: QmRoot -> A -> B:
+	//
+	// cidB := {"foo": {"bar": 42 }}
+	// cidA := {"B": {"/": cidB }}
+	// cidRoot := {"A": {"/": cidA }}
+	//
+	// And resolve paths:
+	// * "/ipfs/${cidRoot}"
+	//   * Calling Cid() will return `cidRoot`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return ``
+	//
+	// * "/ipfs/${cidRoot}/A"
+	//   * Calling Cid() will return `cidA`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return ``
+	//
+	// * "/ipfs/${cidRoot}/A/B/foo"
+	//   * Calling Cid() will return `cidB`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return `foo`
+	//
+	// * "/ipfs/${cidRoot}/A/B/foo/bar"
+	//   * Calling Cid() will return `cidB`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return `foo/bar`
 	Cid() *cid.Cid
 
 	// Root returns the CID of the root object of the path
@@ -43,6 +68,8 @@ type ResolvedPath interface {
 	// Example:
 	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
 	// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
+	//
+	// For more examples see the documentation of Cid() method
 	Root() *cid.Cid
 
 	// Remainder returns unresolved part of the path
@@ -51,9 +78,11 @@ type ResolvedPath interface {
 	// If you have 2 linked objects: QmRoot -> A, where A is a CBOR node
 	// containing the following data:
 	//
-	// {"foo": {"bar": 42}}
+	// {"foo": {"bar": 42 }}
 	//
 	// When resolving "/ipld/QmRoot/A/foo/bar", Remainder will return "foo/bar"
+	//
+	// For more examples see the documentation of Cid() method
 	Remainder() string
 
 	Path

From b808f144b5b65e02307e0de0624deba9758d529e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 12 Jun 2018 03:52:26 +0200
Subject: [PATCH 058/247] coreapi: move path utils to interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@0a0e69cc424e6136e8f0a1fecabda94e7854bc7f

This commit was moved from ipfs/boxo@92ebd6eb7be417dec28e3c8fbc0f0bb4db65d268
---
 core/coreiface/coreapi.go | 10 -----
 core/coreiface/path.go    | 87 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index f5e81adce..82a2ebf4e 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -6,7 +6,6 @@ import (
 	"context"
 
 	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
-	cid "gx/ipfs/QmapdYm1b22Frv3k17fqrBYTFRxwiaVJkB299Mfn33edeB/go-cid"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
@@ -38,13 +37,4 @@ type CoreAPI interface {
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
 	ResolveNode(context.Context, Path) (ipld.Node, error)
-
-	// ParsePath parses string path to a Path
-	ParsePath(string) (Path, error)
-
-	// IpfsPath creates new /ipfs path from the provided CID
-	IpfsPath(*cid.Cid) ResolvedPath
-
-	// IpldPath creates new /ipld path from the provided CID
-	IpldPath(*cid.Cid) ResolvedPath
 }
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index acdcd85da..e097ea3b6 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,13 @@
 package iface
 
 import (
+	ipfspath "github.com/ipfs/go-ipfs/path"
+
 	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )
 
+//TODO: merge with ipfspath so we don't depend on it
+
 // Path is a generic wrapper for paths used in the API. A path can be resolved
 // to a CID using one of Resolve functions in the API.
 //
@@ -87,3 +91,86 @@ type ResolvedPath interface {
 
 	Path
 }
+
+// path implements coreiface.Path
+type path struct {
+	path ipfspath.Path
+}
+
+// resolvedPath implements coreiface.resolvedPath
+type resolvedPath struct {
+	path
+	cid       *cid.Cid
+	root      *cid.Cid
+	remainder string
+}
+
+// IpfsPath creates new /ipfs path from the provided CID
+func IpfsPath(c *cid.Cid) ResolvedPath {
+	return &resolvedPath{
+		path:      path{ipfspath.Path("/ipfs/" + c.String())},
+		cid:       c,
+		root:      c,
+		remainder: "",
+	}
+}
+
+// IpldPath creates new /ipld path from the provided CID
+func IpldPath(c *cid.Cid) ResolvedPath {
+	return &resolvedPath{
+		path:      path{ipfspath.Path("/ipld/" + c.String())},
+		cid:       c,
+		root:      c,
+		remainder: "",
+	}
+}
+
+// ParsePath parses string path to a Path
+func ParsePath(p string) (Path, error) {
+	pp, err := ipfspath.ParsePath(p)
+	if err != nil {
+		return nil, err
+	}
+
+	return &path{path: pp}, nil
+}
+
+// NewResolvedPath creates new ResolvedPath. This function performs no checks
+// and is intended to be used by resolver implementations. Incorrect inputs may
+// cause panics. Handle with care.
+func NewResolvedPath(ipath ipfspath.Path, c *cid.Cid, root *cid.Cid, remainder string) ResolvedPath {
+	return &resolvedPath{
+		path:      path{ipath},
+		cid:       c,
+		root:      root,
+		remainder: remainder,
+	}
+}
+
+func (p *path) String() string {
+	return p.path.String()
+}
+
+func (p *path) Namespace() string {
+	if len(p.path.Segments()) < 1 {
+		panic("path without namespace") //this shouldn't happen under any scenario
+	}
+	return p.path.Segments()[0]
+}
+
+func (p *path) Mutable() bool {
+	//TODO: MFS: check for /local
+	return p.Namespace() == "ipns"
+}
+
+func (p *resolvedPath) Cid() *cid.Cid {
+	return p.cid
+}
+
+func (p *resolvedPath) Root() *cid.Cid {
+	return p.root
+}
+
+func (p *resolvedPath) Remainder() string {
+	return p.remainder
+}

From 68fee2eb3884f58e17551333f47e79cfd64a65c5 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sat, 28 Jul 2018 23:57:42 -0700
Subject: [PATCH 059/247] Extract path and resolver

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ebc2b3570f9c962cc9b9a8440fe1a88fea42628f

This commit was moved from ipfs/boxo@069cd0e0d729e11cf7d9a4374b004e528fca18de
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index e097ea3b6..49b8cc5ea 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "github.com/ipfs/go-ipfs/path"
+	ipfspath "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
 
 	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )

From 1841565f9c1c4cb6520540543bddf4a2cef384b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 2 Feb 2018 16:28:02 +0100
Subject: [PATCH 060/247] coreapi: Pin option for Object.Put
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ca13e9b2ef673c3eb63baecc0cf840036405e214

This commit was moved from ipfs/boxo@8fa8a1e440ea9d280b5c2b717f1de35602f83f08
---
 core/coreiface/options/object.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index aca02d672..9257ea607 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -7,6 +7,7 @@ type ObjectNewSettings struct {
 type ObjectPutSettings struct {
 	InputEnc string
 	DataType string
+	Pin      bool
 }
 
 type ObjectAddLinkSettings struct {
@@ -35,6 +36,7 @@ func ObjectPutOptions(opts ...ObjectPutOption) (*ObjectPutSettings, error) {
 	options := &ObjectPutSettings{
 		InputEnc: "json",
 		DataType: "text",
+		Pin:      false,
 	}
 
 	for _, opt := range opts {
@@ -103,6 +105,15 @@ func (objectOpts) DataType(t string) ObjectPutOption {
 	}
 }
 
+// WithPin is an option for Object.Put which specifies whether to pin the added
+// objects, default is false
+func (objectOpts) WithPin(pin bool) ObjectPutOption {
+	return func(settings *ObjectPutSettings) error {
+		settings.Pin = pin
+		return nil
+	}
+}
+
 // Create is an option for Object.AddLink which specifies whether create required
 // directories for the child
 func (objectOpts) Create(create bool) ObjectAddLinkOption {

From 5dbe176f5331c80be35bce0feeba622113c5545a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 2 Feb 2018 21:50:22 +0100
Subject: [PATCH 061/247] coreapi: implement Object.Diff
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@00f6430f32022c0038bb4407cca5d9f136b0ee24

This commit was moved from ipfs/boxo@83c279f0be6bbc7a498345e8b82b7331b8fb356c
---
 core/coreiface/object.go | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index ea9aa5948..0a716dc97 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -31,6 +31,39 @@ type ObjectStat struct {
 	CumulativeSize int
 }
 
+
+const (
+	// DiffAdd is a Type of ObjectChange where a link was added to the graph
+	DiffAdd = iota
+
+	// DiffRemove is a Type of ObjectChange where a link was removed from the graph
+	DiffRemove
+
+	// DiffMod is a Type of ObjectChange where a link was changed in the graph
+	DiffMod
+)
+
+// ObjectChange represents a change ia a graph
+// TODO: do we want this to be an interface?
+type ObjectChange struct {
+	// Type of the change, either:
+	// * DiffAdd - Added a link
+	// * DiffRemove - Removed a link
+	// * DiffMod - Modified a link
+	Type int
+
+	// Path to the changed link
+	Path string
+
+	// Before holds the link path before the change. Note that when a link is
+	// added, this will be nil.
+	Before Path
+
+	// After holds the link path after the change. Note that when a link is
+	// removed, this will be nil.
+	After Path
+}
+
 // ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
 // for manipulating MerkleDAG data structures.
 type ObjectAPI interface {
@@ -65,4 +98,8 @@ type ObjectAPI interface {
 
 	// SetData sets the data contained in the node
 	SetData(context.Context, Path, io.Reader) (ResolvedPath, error)
+
+	// Diff returns a set of changes needed to transform the first object into the
+	// second.
+	Diff(context.Context, Path, Path) ([]ObjectChange, error)
 }

From cb79396b3531b910737e28a6e4bd4bc35a4ffdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 2 Feb 2018 22:36:01 +0100
Subject: [PATCH 062/247] commands: switch object commands to CoreAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@9fe2a845730cb243ba72ceb3a1be7871467b416b

This commit was moved from ipfs/boxo@157bb70fa94828c5c37466e6cc75e2058454ed2c
---
 core/coreiface/object.go         | 5 ++---
 core/coreiface/options/object.go | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 0a716dc97..1c7caeb77 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -31,7 +31,6 @@ type ObjectStat struct {
 	CumulativeSize int
 }
 
-
 const (
 	// DiffAdd is a Type of ObjectChange where a link was added to the graph
 	DiffAdd = iota
@@ -57,11 +56,11 @@ type ObjectChange struct {
 
 	// Before holds the link path before the change. Note that when a link is
 	// added, this will be nil.
-	Before Path
+	Before ResolvedPath
 
 	// After holds the link path after the change. Note that when a link is
 	// removed, this will be nil.
-	After Path
+	After ResolvedPath
 }
 
 // ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
diff --git a/core/coreiface/options/object.go b/core/coreiface/options/object.go
index 9257ea607..e484a9f36 100644
--- a/core/coreiface/options/object.go
+++ b/core/coreiface/options/object.go
@@ -105,9 +105,9 @@ func (objectOpts) DataType(t string) ObjectPutOption {
 	}
 }
 
-// WithPin is an option for Object.Put which specifies whether to pin the added
+// Pin is an option for Object.Put which specifies whether to pin the added
 // objects, default is false
-func (objectOpts) WithPin(pin bool) ObjectPutOption {
+func (objectOpts) Pin(pin bool) ObjectPutOption {
 	return func(settings *ObjectPutSettings) error {
 		settings.Pin = pin
 		return nil

From 5b28066131841060f97c7291189df9271d7d680b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 25 Jul 2018 22:49:17 +0200
Subject: [PATCH 063/247] object coreapi: Address review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@af43bf0a5b8a8eb409dc5e3731cf86afd5b67304

This commit was moved from ipfs/boxo@c1cdbfdc59df5b72610ae52ff80a44cb81f679c9
---
 core/coreiface/object.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 1c7caeb77..3eb0ea9ef 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -31,25 +31,27 @@ type ObjectStat struct {
 	CumulativeSize int
 }
 
-const (
-	// DiffAdd is a Type of ObjectChange where a link was added to the graph
-	DiffAdd = iota
+// ChangeType denotes type of change in ObjectChange
+type ChangeType int
 
-	// DiffRemove is a Type of ObjectChange where a link was removed from the graph
+const (
+	// DiffAdd is set when a link was added to the graph
+	DiffAdd ChangeType = iota
+
+	// DiffRemove is set when a link was removed from the graph
 	DiffRemove
 
-	// DiffMod is a Type of ObjectChange where a link was changed in the graph
+	// DiffMod is set when a link was changed in the graph
 	DiffMod
 )
 
 // ObjectChange represents a change ia a graph
-// TODO: do we want this to be an interface?
 type ObjectChange struct {
 	// Type of the change, either:
 	// * DiffAdd - Added a link
 	// * DiffRemove - Removed a link
 	// * DiffMod - Modified a link
-	Type int
+	Type ChangeType
 
 	// Path to the changed link
 	Path string

From 04c548b1d2e75aa0f31755a90b1d059ff9210dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 3 Aug 2018 18:06:57 +0200
Subject: [PATCH 064/247] coreapi: dag: Batching interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@f4b74679d1eb5597e430a52f4cca826d511898c3

This commit was moved from ipfs/boxo@83081a0c1b91bb9554d56ea074ef28ca02b38ed9
---
 core/coreiface/dag.go | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 3f92ebab3..a128e97c5 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -4,21 +4,36 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
 )
 
-// DagAPI specifies the interface to IPLD
-type DagAPI interface {
+// DagOps groups operations that can be batched together
+type DagOps interface {
 	// Put inserts data using specified format and input encoding.
 	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
 	// "sha256" are used.
 	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (ResolvedPath, error)
+}
+
+// DagBatch is the batching version of DagAPI. All implementations of DagBatch
+// should be threadsafe
+type DagBatch interface {
+	DagOps
+
+	Commit(ctx context.Context) error
+}
+
+// DagAPI specifies the interface to IPLD
+type DagAPI interface {
+	DagOps
 
 	// Get attempts to resolve and get the node specified by the path
 	Get(ctx context.Context, path Path) (ipld.Node, error)
 
 	// Tree returns list of paths within a node specified by the path.
 	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
+
+	Batch(ctx context.Context) DagBatch
 }

From a9097b5738eaf33a7ae2a723ccacdfd225863833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 3 Aug 2018 18:19:45 +0200
Subject: [PATCH 065/247] coreapi: dag: Missing batch docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@77b458e7426ae384692ed7c70a3a6179f4adc1b3

This commit was moved from ipfs/boxo@de98b9bd4549e5e475d3d096c519ae685ac008cc
---
 core/coreiface/dag.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index a128e97c5..01d6112e7 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -22,6 +22,7 @@ type DagOps interface {
 type DagBatch interface {
 	DagOps
 
+	// Commit commits nodes to the datastore and announces them to the network
 	Commit(ctx context.Context) error
 }
 
@@ -35,5 +36,6 @@ type DagAPI interface {
 	// Tree returns list of paths within a node specified by the path.
 	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
 
+	// Batch creates new DagBatch
 	Batch(ctx context.Context) DagBatch
 }

From eea330740907c05834d39687ddc1596387f5743f Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sun, 5 Aug 2018 13:22:51 -0700
Subject: [PATCH 066/247] Update bitswap deps

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@24dde48825577a7f5e052be01025f22a413cc57b

This commit was moved from ipfs/boxo@3bb8c057c6fe89c2bcc4824581cb3e444f0459c8
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 49b8cc5ea..069474c23 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
+	ipfspath "gx/ipfs/Qme34dT9spiPgunbueNtziRX4SvfLHDFZQvmTBVK8p4qNT/go-path"
 
 	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )

From e4f5db5aa62f7982c2361a80b111d636de4640a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 3 Aug 2018 16:46:25 +0200
Subject: [PATCH 067/247] coreapi: key: some changes to match command
 functionality
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@12537a60f5318fec2fdf2c02a3afd3786b673f07

This commit was moved from ipfs/boxo@f9afe981175685c29705b480a2a68688d14c3a3b
---
 core/coreiface/key.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 928aa265f..9e9c7e400 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -4,14 +4,20 @@ import (
 	"context"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	"gx/ipfs/QmdVrMn1LhB4ybb8hMVaMLXnA8XRSewMnK6YqXKXoTcRvN/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
 type Key interface {
 	// Key returns key name
 	Name() string
+
 	// Path returns key path
 	Path() Path
+
+	// Id returns key PeerID
+	Id() peer.ID
 }
 
 // KeyAPI specifies the interface to Keystore
@@ -28,5 +34,5 @@ type KeyAPI interface {
 	List(ctx context.Context) ([]Key, error)
 
 	// Remove removes keys from keystore. Returns ipns path of the removed key
-	Remove(ctx context.Context, name string) (Path, error)
+	Remove(ctx context.Context, name string) (Key, error)
 }

From 16c6be00861e9c59cb66bad9a412a94d61db64a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 7 Aug 2018 15:10:34 +0200
Subject: [PATCH 068/247] key cmd: fix codeclimate warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@814f82cf806d4fefc9f5158e85807b4c96751637

This commit was moved from ipfs/boxo@55223e9427daacfa41800357a551aad8bce06ea1
---
 core/coreiface/key.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 9e9c7e400..2abf3559b 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -16,8 +16,8 @@ type Key interface {
 	// Path returns key path
 	Path() Path
 
-	// Id returns key PeerID
-	Id() peer.ID
+	// ID returns key PeerID
+	ID() peer.ID
 }
 
 // KeyAPI specifies the interface to Keystore

From 390006651bde2fab907f89e3d946b83c5021f677 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 6 Aug 2018 22:10:53 -0700
Subject: [PATCH 069/247] gx: update deps

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@365f5eb472016cac6e893ccd44a114eb9b8cfcd5

This commit was moved from ipfs/boxo@aa067a121b31b26ae87a5a2494f574c55e2e7edc
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 069474c23..4c4c51532 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/Qme34dT9spiPgunbueNtziRX4SvfLHDFZQvmTBVK8p4qNT/go-path"
+	ipfspath "gx/ipfs/QmY2QaawxgJw2rn7WsFNkWEYph3z2azpyYdrhAc1JctDmE/go-path"
 
 	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )

From e24a33d4cbf6ac3c67eac3320f42c5ecd7795b67 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 8 Aug 2018 18:51:17 -0700
Subject: [PATCH 070/247] update gogo-protobuf

fixes #3214

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@1ef16343d8d91bd685c8b4dc6554fda5e4531b36

This commit was moved from ipfs/boxo@e415aa12146cdbaffdc1619687c307cd9de09842
---
 core/coreiface/key.go  | 2 +-
 core/coreiface/path.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 2abf3559b..3730f3592 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmdVrMn1LhB4ybb8hMVaMLXnA8XRSewMnK6YqXKXoTcRvN/go-libp2p-peer"
+	"gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 4c4c51532..c51d31645 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmY2QaawxgJw2rn7WsFNkWEYph3z2azpyYdrhAc1JctDmE/go-path"
+	ipfspath "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
 
 	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
 )

From 0d7b9a837e694a50d8cd1f9e179b2c569c4a11df Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Sun, 12 Aug 2018 19:15:07 -0400
Subject: [PATCH 071/247] Gx updates and fixes to use new cid.Builder
 interface.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@05f527a4ab81c36f8965de35bdb8352a92a61718

This commit was moved from ipfs/boxo@d91c0d7ac499f29b5b49219df4c1fdbf2e222bcd
---
 core/coreiface/coreapi.go     | 2 +-
 core/coreiface/dag.go         | 2 +-
 core/coreiface/object.go      | 4 ++--
 core/coreiface/options/dag.go | 2 +-
 core/coreiface/path.go        | 4 ++--
 core/coreiface/unixfs.go      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 82a2ebf4e..d7614f01d 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
+	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 01d6112e7..77577d0fc 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
+	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 3eb0ea9ef..dc86f46c1 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
-	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
+	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
+	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index 57465deee..a43a144fc 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
+	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index c51d31645..28e0f431c 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
+	ipfspath "gx/ipfs/QmTG5WFmAM4uAnqGskeAPijdpTmmNDLJNCQ71NqfdvC6hV/go-path"
 
-	cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
+	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 1ddc20674..0ec63d516 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
+	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From e1f39ec60e3ada6404a5d5681b872c0b483e7c1b Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 13 Aug 2018 14:29:22 -0700
Subject: [PATCH 072/247] update go-datastore to use []byte values instead of
 {}interface values

* Most of our datastores barf on non []byte values.
* We have to have a bunch of "is this a []byte" checks.
* Saves some allocations.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@bb2d55c26ae125a50a6250df13479d70a84e4073

This commit was moved from ipfs/boxo@454f0f425c406d96427b7e0a262a33081c308dbf
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 28e0f431c..d2933ece5 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmTG5WFmAM4uAnqGskeAPijdpTmmNDLJNCQ71NqfdvC6hV/go-path"
+	ipfspath "gx/ipfs/QmV1W98rBAovVJGkeYHfqJ19JdT9dQbbWsCq9zPaMyrxYx/go-path"
 
 	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
 )

From 9bef462a53b0edbc64bc2ad2c6c3e122895a17cf Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 15 Aug 2018 08:30:22 -0700
Subject: [PATCH 073/247] gx: update go-cid

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@9d5772a1cf4ffcf6d9c7717e074d30540d36f263

This commit was moved from ipfs/boxo@aac8a89a8ac8584416db46bc1968cd3e185241db
---
 core/coreiface/coreapi.go     | 2 +-
 core/coreiface/dag.go         | 2 +-
 core/coreiface/object.go      | 4 ++--
 core/coreiface/options/dag.go | 2 +-
 core/coreiface/path.go        | 4 ++--
 core/coreiface/unixfs.go      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index d7614f01d..ab5374069 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
+	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 77577d0fc..d547e8531 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
+	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index dc86f46c1..812b69a64 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
-	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
+	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
+	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index a43a144fc..e89e4d707 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
+	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index d2933ece5..49cea48cc 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmV1W98rBAovVJGkeYHfqJ19JdT9dQbbWsCq9zPaMyrxYx/go-path"
+	ipfspath "gx/ipfs/QmWMcvZbNvk5codeqbm7L89C9kqSwka4KaHnDb8HRnxsSL/go-path"
 
-	cid "gx/ipfs/Qmdu2AYUV7yMoVBQPxXNfe7FJcdx16kYtsx6jAPKWQYF1y/go-cid"
+	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 0ec63d516..b42f56ba8 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/QmUSyMZ8Vt4vTZr5HdDEgEfpwAXfQRuDdfCFTt7XBzhxpQ/go-ipld-format"
+	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From daa7186346d3f4263b3ebd2665695d933dccf2b5 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 21 Aug 2018 17:10:11 -0700
Subject: [PATCH 074/247] gx: update go-cid, go-libp2p-peer, go-ipfs-cmds,
 go-ipfs-cmdkit

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@14b366d332ad7524863889d6eddc696b550c57dd

This commit was moved from ipfs/boxo@66c959b336ec55e8b2f9fbb8bd17f0922fdc0473
---
 core/coreiface/coreapi.go     | 2 +-
 core/coreiface/dag.go         | 2 +-
 core/coreiface/key.go         | 2 +-
 core/coreiface/object.go      | 4 ++--
 core/coreiface/options/dag.go | 2 +-
 core/coreiface/path.go        | 4 ++--
 core/coreiface/unixfs.go      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index ab5374069..696eefbaf 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
+	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index d547e8531..d3270928c 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
+	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 3730f3592..cc7c409fd 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
+	"gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 812b69a64..750638a33 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
-	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
+	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
+	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index e89e4d707..689bb5c53 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
+	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 49cea48cc..25b09f486 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmWMcvZbNvk5codeqbm7L89C9kqSwka4KaHnDb8HRnxsSL/go-path"
+	ipfspath "gx/ipfs/QmdMPBephdLYNESkruDX2hcDTgFYhoCt4LimWhgnomSdV2/go-path"
 
-	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
+	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index b42f56ba8..80f7ba396 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/QmaA8GkXUYinkkndvg7T6Tx7gYXemhxjaxLisEPes7Rf1P/go-ipld-format"
+	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From 7475c9a2465004489a6f1382a087127b5576c9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 2 Aug 2018 09:48:52 +0200
Subject: [PATCH 075/247] block cmd: use coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@f4e38c0970c260e17d89348001eb15769e4650d8

This commit was moved from ipfs/boxo@e0f2bd3ae8cc797a0cdb789d8d7166b21d0264e9
---
 core/coreiface/block.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index 468c00947..b99b05fdb 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -19,7 +19,7 @@ type BlockStat interface {
 // BlockAPI specifies the interface to the block layer
 type BlockAPI interface {
 	// Put imports raw block data, hashing it using specified settings.
-	Put(context.Context, io.Reader, ...options.BlockPutOption) (ResolvedPath, error)
+	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)

From 9716a02efe48ba601eac8a07426d8f9f3a495c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 13 Aug 2018 21:39:41 +0200
Subject: [PATCH 076/247] coreapi: block: don't allow creation of invalid
 cidv0s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@f9d6dcc420879110f6d332e3de5a2048c07497e9

This commit was moved from ipfs/boxo@1c96fc32d211d18837b63a3befd65a24c600e430
---
 core/coreiface/options/block.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index d6da99774..99445cca3 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -19,7 +19,7 @@ type BlockRmOption func(*BlockRmSettings) error
 
 func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, error) {
 	options := &BlockPutSettings{
-		Codec:    "v0",
+		Codec:    "",
 		MhType:   multihash.SHA2_256,
 		MhLength: -1,
 	}

From b089e7cadcdb8cdf85874ea606bb64e7a1023487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 15 Aug 2018 14:01:19 +0200
Subject: [PATCH 077/247] coreapi: block: move option logic to options package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@68340710253f13b5c5376a9f882608cb0ab17f8c

This commit was moved from ipfs/boxo@571c6def44851832a3617c699f1b166d1c9dc959
---
 core/coreiface/options/block.go | 44 +++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 99445cca3..36b3baa0e 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -1,7 +1,9 @@
 package options
 
 import (
-	"gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+	"fmt"
+	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )
 
 type BlockPutSettings struct {
@@ -17,20 +19,52 @@ type BlockRmSettings struct {
 type BlockPutOption func(*BlockPutSettings) error
 type BlockRmOption func(*BlockRmSettings) error
 
-func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, error) {
+func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, cid.Prefix, error) {
 	options := &BlockPutSettings{
 		Codec:    "",
-		MhType:   multihash.SHA2_256,
+		MhType:   mh.SHA2_256,
 		MhLength: -1,
 	}
 
 	for _, opt := range opts {
 		err := opt(options)
 		if err != nil {
-			return nil, err
+			return nil, cid.Prefix{}, err
 		}
 	}
-	return options, nil
+
+	var pref cid.Prefix
+	pref.Version = 1
+
+	if options.Codec == "" {
+		if options.MhType != mh.SHA2_256 || (options.MhLength != -1 && options.MhLength != 32) {
+			options.Codec = "protobuf"
+		} else {
+			options.Codec = "v0"
+		}
+	}
+
+	if options.Codec == "v0" && options.MhType == mh.SHA2_256 {
+		pref.Version = 0
+	}
+
+	formatval, ok := cid.Codecs[options.Codec]
+	if !ok {
+		return nil, cid.Prefix{}, fmt.Errorf("unrecognized format: %s", options.Codec)
+	}
+
+	if options.Codec == "v0" {
+		if options.MhType != mh.SHA2_256 || (options.MhLength != -1 && options.MhLength != 32) {
+			return nil, cid.Prefix{}, fmt.Errorf("only sha2-255-32 is allowed with CIDv0")
+		}
+	}
+
+	pref.Codec = formatval
+
+	pref.MhType = options.MhType
+	pref.MhLength = options.MhLength
+
+	return options, pref, nil
 }
 
 func BlockRmOptions(opts ...BlockRmOption) (*BlockRmSettings, error) {

From 3936b1e39d482574d75aa1e189c33f6c97d90544 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 29 Aug 2018 21:04:56 -0700
Subject: [PATCH 078/247] gx update deps

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@db3f7c2c47e384fabdc30a1b9141b92f56375f5d

This commit was moved from ipfs/boxo@15e2043dc4f58e44d5676386753c2b8ec5be5229
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 25b09f486..7873fe2bf 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmdMPBephdLYNESkruDX2hcDTgFYhoCt4LimWhgnomSdV2/go-path"
+	ipfspath "gx/ipfs/QmTKaiDxQqVxmA1bRipSuP7hnTSgnMSmEa98NYeS6fcoiv/go-path"
 
 	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )

From ae4189615030c7c4180f055426fdac04111ce15d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 7 Sep 2018 23:40:08 -0700
Subject: [PATCH 079/247] gx: update peerstore

Also:

* Updates go-floodsub to fix a data race.
* Updates golang-lru

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@618aaa45543916248c209032a2e0309793666dd3

This commit was moved from ipfs/boxo@55f24526833cddd68b49a7858a48d8019b00a617
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 7873fe2bf..c2b4cd869 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmTKaiDxQqVxmA1bRipSuP7hnTSgnMSmEa98NYeS6fcoiv/go-path"
+	ipfspath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
 
 	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )

From 0787fb8f31349a102368878f3ea92ea59b0385bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:07:50 +0100
Subject: [PATCH 080/247] coreapi: dht interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@bbd736fdecec3e18d61e72b5a4beb9234f66c1ec

This commit was moved from ipfs/boxo@6c40247cc1931a891782c579d48f517a7945569b
---
 core/coreiface/dht.go         | 28 ++++++++++++++++++++++++++++
 core/coreiface/options/dht.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 core/coreiface/dht.go
 create mode 100644 core/coreiface/options/dht.go

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
new file mode 100644
index 000000000..1c8e68bd1
--- /dev/null
+++ b/core/coreiface/dht.go
@@ -0,0 +1,28 @@
+package iface
+
+import (
+	"context"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
+	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+)
+
+// DhtAPI specifies the interface to the DHT
+type DhtAPI interface {
+	// FindPeer queries the DHT for all of the multiaddresses associated with a
+	// Peer ID
+	FindPeer(context.Context, peer.ID) (<-chan ma.Multiaddr, error)
+
+	// FindProviders finds peers in the DHT who can provide a specific value
+	// given a key.
+	FindProviders(context.Context, Path) (<-chan peer.ID, error) //TODO: is path the right choice here?
+
+	// Provide announces to the network that you are providing given values
+	Provide(context.Context, Path, ...options.DhtProvideOption) error
+
+	// WithRecursive is an option for Provide which specifies whether to provide
+	// the given path recursively
+	WithRecursive(recursive bool) options.DhtProvideOption
+}
diff --git a/core/coreiface/options/dht.go b/core/coreiface/options/dht.go
new file mode 100644
index 000000000..92fd14f4a
--- /dev/null
+++ b/core/coreiface/options/dht.go
@@ -0,0 +1,30 @@
+package options
+
+type DhtProvideSettings struct {
+	Recursive bool
+}
+
+type DhtProvideOption func(*DhtProvideSettings) error
+
+func DhtProvideOptions(opts ...DhtProvideOption) (*DhtProvideSettings, error) {
+	options := &DhtProvideSettings{
+		Recursive: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type DhtOptions struct{}
+
+func (api *DhtOptions) WithRecursive(recursive bool) DhtProvideOption {
+	return func(settings *DhtProvideSettings) error {
+		settings.Recursive = recursive
+		return nil
+	}
+}

From e11318040f8b6c396e64cfbfad1e31332275b7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:12:54 +0100
Subject: [PATCH 081/247] coreapi: implement dht api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@db9865b9ee918e7db54e6cffa41a0e8950b3e170

This commit was moved from ipfs/boxo@1ca0f8b291354c50b54f51c7afd42bafcee8a0a6
---
 core/coreiface/coreapi.go     |  3 +++
 core/coreiface/dht.go         |  6 +++++-
 core/coreiface/options/dht.go | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 696eefbaf..9811b75be 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -31,6 +31,9 @@ type CoreAPI interface {
 	// ObjectAPI returns an implementation of Object API
 	Object() ObjectAPI
 
+	// Dht returns an implementation of Dht API
+	Dht() DhtAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (ResolvedPath, error)
 
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 1c8e68bd1..ce8509e01 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -17,7 +17,11 @@ type DhtAPI interface {
 
 	// FindProviders finds peers in the DHT who can provide a specific value
 	// given a key.
-	FindProviders(context.Context, Path) (<-chan peer.ID, error) //TODO: is path the right choice here?
+	FindProviders(context.Context, Path, ...options.DhtFindProvidersOption) (<-chan peer.ID, error) //TODO: is path the right choice here?
+
+	// WithNumProviders is an option for FindProviders which specifies the
+	// number of peers to look for. Default is 20
+	WithNumProviders(numProviders int) options.DhtFindProvidersOption
 
 	// Provide announces to the network that you are providing given values
 	Provide(context.Context, Path, ...options.DhtProvideOption) error
diff --git a/core/coreiface/options/dht.go b/core/coreiface/options/dht.go
index 92fd14f4a..3867e32c0 100644
--- a/core/coreiface/options/dht.go
+++ b/core/coreiface/options/dht.go
@@ -4,7 +4,12 @@ type DhtProvideSettings struct {
 	Recursive bool
 }
 
+type DhtFindProvidersSettings struct {
+	NumProviders int
+}
+
 type DhtProvideOption func(*DhtProvideSettings) error
+type DhtFindProvidersOption func(*DhtFindProvidersSettings) error
 
 func DhtProvideOptions(opts ...DhtProvideOption) (*DhtProvideSettings, error) {
 	options := &DhtProvideSettings{
@@ -20,6 +25,20 @@ func DhtProvideOptions(opts ...DhtProvideOption) (*DhtProvideSettings, error) {
 	return options, nil
 }
 
+func DhtFindProvidersOptions(opts ...DhtFindProvidersOption) (*DhtFindProvidersSettings, error) {
+	options := &DhtFindProvidersSettings{
+		NumProviders: 20,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
 type DhtOptions struct{}
 
 func (api *DhtOptions) WithRecursive(recursive bool) DhtProvideOption {
@@ -28,3 +47,10 @@ func (api *DhtOptions) WithRecursive(recursive bool) DhtProvideOption {
 		return nil
 	}
 }
+
+func (api *DhtOptions) WithNumProviders(numProviders int) DhtFindProvidersOption {
+	return func(settings *DhtFindProvidersSettings) error {
+		settings.NumProviders = numProviders
+		return nil
+	}
+}

From afebd69388663cc1834e6f3e5660d91883cf6938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:17:30 +0100
Subject: [PATCH 082/247] coreapi: test using mock swarm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@db721461cc7c24fba56f74cfd6eb9c8064d0f8c5

This commit was moved from ipfs/boxo@0e411a61d02330a3b2544fb300e4577c1e0a1087
---
 core/coreiface/dht.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index ce8509e01..1d23ece1f 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
-	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 )
 
 // DhtAPI specifies the interface to the DHT

From e8da394b2146191447cf5812e4a8bcc846effcd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 19 Jul 2018 13:18:05 +0200
Subject: [PATCH 083/247] coreapi: dht: simplify the implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@22a12c2c233473aafa66ced10e222162a7711868

This commit was moved from ipfs/boxo@78b1cf5653e1cc2d8192db2b541fa09e2dbb2c7f
---
 core/coreiface/dht.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 1d23ece1f..01b7d7367 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -3,21 +3,21 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
-	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
+	pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
 type DhtAPI interface {
 	// FindPeer queries the DHT for all of the multiaddresses associated with a
 	// Peer ID
-	FindPeer(context.Context, peer.ID) (<-chan ma.Multiaddr, error)
+	FindPeer(context.Context, peer.ID) (pstore.PeerInfo, error)
 
 	// FindProviders finds peers in the DHT who can provide a specific value
 	// given a key.
-	FindProviders(context.Context, Path, ...options.DhtFindProvidersOption) (<-chan peer.ID, error) //TODO: is path the right choice here?
+	FindProviders(context.Context, Path, ...options.DhtFindProvidersOption) (<-chan pstore.PeerInfo, error)
 
 	// WithNumProviders is an option for FindProviders which specifies the
 	// number of peers to look for. Default is 20

From db3e060d61725dc22e97d7dab4ea69b3990f1170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 19 Jul 2018 13:27:06 +0200
Subject: [PATCH 084/247] coreapi: dht: refactor options after rebase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@656fc75b6f65435e224b7bd1e392ee8daf90f9b2

This commit was moved from ipfs/boxo@2bef47921404e491af08c3f66fc8475f53526685
---
 core/coreiface/dht.go         |  8 --------
 core/coreiface/options/dht.go | 12 +++++++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 01b7d7367..f9a08df34 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -19,14 +19,6 @@ type DhtAPI interface {
 	// given a key.
 	FindProviders(context.Context, Path, ...options.DhtFindProvidersOption) (<-chan pstore.PeerInfo, error)
 
-	// WithNumProviders is an option for FindProviders which specifies the
-	// number of peers to look for. Default is 20
-	WithNumProviders(numProviders int) options.DhtFindProvidersOption
-
 	// Provide announces to the network that you are providing given values
 	Provide(context.Context, Path, ...options.DhtProvideOption) error
-
-	// WithRecursive is an option for Provide which specifies whether to provide
-	// the given path recursively
-	WithRecursive(recursive bool) options.DhtProvideOption
 }
diff --git a/core/coreiface/options/dht.go b/core/coreiface/options/dht.go
index 3867e32c0..f989fa5e7 100644
--- a/core/coreiface/options/dht.go
+++ b/core/coreiface/options/dht.go
@@ -39,16 +39,22 @@ func DhtFindProvidersOptions(opts ...DhtFindProvidersOption) (*DhtFindProvidersS
 	return options, nil
 }
 
-type DhtOptions struct{}
+type dhtOpts struct{}
 
-func (api *DhtOptions) WithRecursive(recursive bool) DhtProvideOption {
+var Dht dhtOpts
+
+// WithRecursive is an option for Dht.Provide which specifies whether to provide
+// the given path recursively
+func (dhtOpts) WithRecursive(recursive bool) DhtProvideOption {
 	return func(settings *DhtProvideSettings) error {
 		settings.Recursive = recursive
 		return nil
 	}
 }
 
-func (api *DhtOptions) WithNumProviders(numProviders int) DhtFindProvidersOption {
+// WithNumProviders is an option for Dht.FindProviders which specifies the
+// number of peers to look for. Default is 20
+func (dhtOpts) WithNumProviders(numProviders int) DhtFindProvidersOption {
 	return func(settings *DhtFindProvidersSettings) error {
 		settings.NumProviders = numProviders
 		return nil

From 1baa0c0a71135bed10d4602d53ae642860d47d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 26 Jul 2018 15:09:26 +0200
Subject: [PATCH 085/247] coreapi dht: add a note on name change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@da52b4bfdb425964a3b5909bdbeacdfdb57cef40

This commit was moved from ipfs/boxo@1ee72b14142c20703fe9bd9690543d42491b5a91
---
 core/coreiface/dht.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index f9a08df34..cd704c3e3 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -10,6 +10,8 @@ import (
 )
 
 // DhtAPI specifies the interface to the DHT
+// Note: This API will likely get renamed in near future, see
+// https://github.com/ipfs/interface-ipfs-core/issues/249 for more context.
 type DhtAPI interface {
 	// FindPeer queries the DHT for all of the multiaddresses associated with a
 	// Peer ID

From 835950fe4a2548c91a771c7cc67b24991747328f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 10 Aug 2018 13:24:33 +0200
Subject: [PATCH 086/247] move streaming set to thirdparty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@03a210bb130d8d46bc9d8c8bbac953edff53f32f

This commit was moved from ipfs/boxo@8de59ef7854d5f337c333acc9902715e274cf2dc
---
 core/coreiface/dht.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index cd704c3e3..7b8119e44 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -10,7 +10,7 @@ import (
 )
 
 // DhtAPI specifies the interface to the DHT
-// Note: This API will likely get renamed in near future, see
+// Note: This API will likely get deprecated in near future, see
 // https://github.com/ipfs/interface-ipfs-core/issues/249 for more context.
 type DhtAPI interface {
 	// FindPeer queries the DHT for all of the multiaddresses associated with a

From f56bdca2e6d56240778d8688e580ca385c2becc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 28 Aug 2018 02:22:09 +0200
Subject: [PATCH 087/247] coreapi: dht: remove option prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a288d2c93dd22c48050ffb8cadce259377fd2125

This commit was moved from ipfs/boxo@4390a24ff2b4e85d7c999f3a1066c55bb2fa1cd6
---
 core/coreiface/options/dht.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/options/dht.go b/core/coreiface/options/dht.go
index f989fa5e7..e13e16020 100644
--- a/core/coreiface/options/dht.go
+++ b/core/coreiface/options/dht.go
@@ -43,18 +43,18 @@ type dhtOpts struct{}
 
 var Dht dhtOpts
 
-// WithRecursive is an option for Dht.Provide which specifies whether to provide
+// Recursive is an option for Dht.Provide which specifies whether to provide
 // the given path recursively
-func (dhtOpts) WithRecursive(recursive bool) DhtProvideOption {
+func (dhtOpts) Recursive(recursive bool) DhtProvideOption {
 	return func(settings *DhtProvideSettings) error {
 		settings.Recursive = recursive
 		return nil
 	}
 }
 
-// WithNumProviders is an option for Dht.FindProviders which specifies the
+// NumProviders is an option for Dht.FindProviders which specifies the
 // number of peers to look for. Default is 20
-func (dhtOpts) WithNumProviders(numProviders int) DhtFindProvidersOption {
+func (dhtOpts) NumProviders(numProviders int) DhtFindProvidersOption {
 	return func(settings *DhtFindProvidersSettings) error {
 		settings.NumProviders = numProviders
 		return nil

From 00a0dc6a4b8a9a580abc1e5ed50539f2d5400499 Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Tue, 11 Sep 2018 22:19:44 -0400
Subject: [PATCH 088/247] gx update and fix code to use new Cid type

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@bdbcb4cff02fb5502fc59563e5cb51c641261390

This commit was moved from ipfs/boxo@a48e694f9d8c710e4354c9818c46ae76d5fece00
---
 core/coreiface/coreapi.go       |  2 +-
 core/coreiface/dag.go           |  2 +-
 core/coreiface/object.go        |  6 +++---
 core/coreiface/options/block.go |  2 +-
 core/coreiface/options/dag.go   |  2 +-
 core/coreiface/path.go          | 22 +++++++++++-----------
 core/coreiface/unixfs.go        |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 9811b75be..0053d472e 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
+	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index d3270928c..06bb91dce 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
+	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 750638a33..6b355a302 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,14 +6,14 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
-	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
 type ObjectStat struct {
 	// Cid is the CID of the node
-	Cid *cid.Cid
+	Cid cid.Cid
 
 	// NumLinks is number of links the node contains
 	NumLinks int
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 36b3baa0e..6603136f3 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -2,8 +2,8 @@ package options
 
 import (
 	"fmt"
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
 )
 
 type BlockPutSettings struct {
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index 689bb5c53..4fdff0489 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index c2b4cd869..e11e20cf0 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmNgXoHgXU1HzNb2HEZmRww9fDKE9NfDsvQwWLHiKHpvKM/go-path"
+	ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 
-	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
@@ -65,7 +65,7 @@ type ResolvedPath interface {
 	//   * Calling Cid() will return `cidB`
 	//   * Calling Root() will return `cidRoot`
 	//   * Calling Remainder() will return `foo/bar`
-	Cid() *cid.Cid
+	Cid() cid.Cid
 
 	// Root returns the CID of the root object of the path
 	//
@@ -74,7 +74,7 @@ type ResolvedPath interface {
 	// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
 	//
 	// For more examples see the documentation of Cid() method
-	Root() *cid.Cid
+	Root() cid.Cid
 
 	// Remainder returns unresolved part of the path
 	//
@@ -100,13 +100,13 @@ type path struct {
 // resolvedPath implements coreiface.resolvedPath
 type resolvedPath struct {
 	path
-	cid       *cid.Cid
-	root      *cid.Cid
+	cid       cid.Cid
+	root      cid.Cid
 	remainder string
 }
 
 // IpfsPath creates new /ipfs path from the provided CID
-func IpfsPath(c *cid.Cid) ResolvedPath {
+func IpfsPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
 		path:      path{ipfspath.Path("/ipfs/" + c.String())},
 		cid:       c,
@@ -116,7 +116,7 @@ func IpfsPath(c *cid.Cid) ResolvedPath {
 }
 
 // IpldPath creates new /ipld path from the provided CID
-func IpldPath(c *cid.Cid) ResolvedPath {
+func IpldPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
 		path:      path{ipfspath.Path("/ipld/" + c.String())},
 		cid:       c,
@@ -138,7 +138,7 @@ func ParsePath(p string) (Path, error) {
 // NewResolvedPath creates new ResolvedPath. This function performs no checks
 // and is intended to be used by resolver implementations. Incorrect inputs may
 // cause panics. Handle with care.
-func NewResolvedPath(ipath ipfspath.Path, c *cid.Cid, root *cid.Cid, remainder string) ResolvedPath {
+func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
 	return &resolvedPath{
 		path:      path{ipath},
 		cid:       c,
@@ -163,11 +163,11 @@ func (p *path) Mutable() bool {
 	return p.Namespace() == "ipns"
 }
 
-func (p *resolvedPath) Cid() *cid.Cid {
+func (p *resolvedPath) Cid() cid.Cid {
 	return p.cid
 }
 
-func (p *resolvedPath) Root() *cid.Cid {
+func (p *resolvedPath) Root() cid.Cid {
 	return p.root
 }
 
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 80f7ba396..4a3aff6fc 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
+	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From 4160bd519c749fec8d300939a6f51e562cfa4c1a Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 11 Sep 2018 20:34:52 -0700
Subject: [PATCH 089/247] gx: fix hashes

(some extra files got committed)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@dec563d93e818189ec52f7eeeb70128c1c62deae

This commit was moved from ipfs/boxo@91297a54c6b70a51fdea8f98c646e4191fc5d9ae
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index e11e20cf0..c61b33533 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	ipfspath "gx/ipfs/QmX7uSbkNz76yNwBhuwYwRbhihLnJqM73VTCjS3UMJud9A/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 7455bd65c0698e9a7975fd9fb072de6beb126e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 18 Sep 2018 04:30:33 +0200
Subject: [PATCH 090/247] resolve cmd: use coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@c3053e816481188f8b20f1d56c3cfa648d4f39c8

This commit was moved from ipfs/boxo@28fe139695b6494eb257aca0d7e21741497a640a
---
 core/coreiface/options/name.go | 43 +++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 48aecf18b..9ba4a8770 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -14,9 +14,12 @@ type NamePublishSettings struct {
 }
 
 type NameResolveSettings struct {
-	Recursive bool
-	Local     bool
-	Cache     bool
+	Depth int
+	Local bool
+	Cache bool
+
+	DhtRecordCount int
+	DhtTimeout     time.Duration
 }
 
 type NamePublishOption func(*NamePublishSettings) error
@@ -40,9 +43,12 @@ func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error)
 
 func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error) {
 	options := &NameResolveSettings{
-		Recursive: false,
-		Local:     false,
-		Cache:     true,
+		Depth: 1,
+		Local: false,
+		Cache: true,
+
+		DhtRecordCount: 16,
+		DhtTimeout:     time.Minute,
 	}
 
 	for _, opt := range opts {
@@ -80,11 +86,11 @@ func (nameOpts) Key(key string) NamePublishOption {
 	}
 }
 
-// Recursive is an option for Name.Resolve which specifies whether to perform a
+// Depth is an option for Name.Resolve which specifies the maximum depth of a
 // recursive lookup. Default value is false
-func (nameOpts) Recursive(recursive bool) NameResolveOption {
+func (nameOpts) Depth(depth int) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
-		settings.Recursive = recursive
+		settings.Depth = depth
 		return nil
 	}
 }
@@ -106,3 +112,22 @@ func (nameOpts) Cache(cache bool) NameResolveOption {
 		return nil
 	}
 }
+
+// DhtRecordCount is an option for Name.Resolve which specifies how many records
+// we want to validate before selecting the best one (newest). Note that setting
+// this value too low will have security implications
+func (nameOpts) DhtRecordCount(rc int) NameResolveOption {
+	return func(settings *NameResolveSettings) error {
+		settings.DhtRecordCount = rc
+		return nil
+	}
+}
+
+// DhtTimeout is an option for Name.Resolve which specifies timeout for
+// DHT lookup
+func (nameOpts) DhtTimeout(timeout time.Duration) NameResolveOption {
+	return func(settings *NameResolveSettings) error {
+		settings.DhtTimeout = timeout
+		return nil
+	}
+}

From 5411cc043c1656f4d4def511bea861932393b7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 19 Sep 2018 11:51:42 +0200
Subject: [PATCH 091/247] coreapi name: accept namesys options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ca81d824222df0ed2c1ede6a3e166f7aa420b4f7

This commit was moved from ipfs/boxo@cd88b19ccb6d4ff617ea5e4c329c284315fc8707
---
 core/coreiface/options/name.go | 36 ++++++----------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 9ba4a8770..ba3691b03 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -2,6 +2,8 @@ package options
 
 import (
 	"time"
+
+	ropts "github.com/ipfs/go-ipfs/namesys/opts"
 )
 
 const (
@@ -14,12 +16,10 @@ type NamePublishSettings struct {
 }
 
 type NameResolveSettings struct {
-	Depth int
 	Local bool
 	Cache bool
 
-	DhtRecordCount int
-	DhtTimeout     time.Duration
+	ResolveOpts []ropts.ResolveOpt
 }
 
 type NamePublishOption func(*NamePublishSettings) error
@@ -43,12 +43,8 @@ func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error)
 
 func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error) {
 	options := &NameResolveSettings{
-		Depth: 1,
 		Local: false,
 		Cache: true,
-
-		DhtRecordCount: 16,
-		DhtTimeout:     time.Minute,
 	}
 
 	for _, opt := range opts {
@@ -86,15 +82,6 @@ func (nameOpts) Key(key string) NamePublishOption {
 	}
 }
 
-// Depth is an option for Name.Resolve which specifies the maximum depth of a
-// recursive lookup. Default value is false
-func (nameOpts) Depth(depth int) NameResolveOption {
-	return func(settings *NameResolveSettings) error {
-		settings.Depth = depth
-		return nil
-	}
-}
-
 // Local is an option for Name.Resolve which specifies if the lookup should be
 // offline. Default value is false
 func (nameOpts) Local(local bool) NameResolveOption {
@@ -113,21 +100,10 @@ func (nameOpts) Cache(cache bool) NameResolveOption {
 	}
 }
 
-// DhtRecordCount is an option for Name.Resolve which specifies how many records
-// we want to validate before selecting the best one (newest). Note that setting
-// this value too low will have security implications
-func (nameOpts) DhtRecordCount(rc int) NameResolveOption {
+//
+func (nameOpts) ResolveOption(opt ropts.ResolveOpt) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
-		settings.DhtRecordCount = rc
-		return nil
-	}
-}
-
-// DhtTimeout is an option for Name.Resolve which specifies timeout for
-// DHT lookup
-func (nameOpts) DhtTimeout(timeout time.Duration) NameResolveOption {
-	return func(settings *NameResolveSettings) error {
-		settings.DhtTimeout = timeout
+		settings.ResolveOpts = append(settings.ResolveOpts, opt)
 		return nil
 	}
 }

From e8e2f54912998b5d4f2bd97f45ccc58aef0dbd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 24 Sep 2018 14:03:57 +0200
Subject: [PATCH 092/247] gx: update go-libp2p-routing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@143c911f1528ad45768b9ea1dd180b865c229fd1

This commit was moved from ipfs/boxo@fdaee8e479945dfe29bec1b56e575b5c9622a454
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index c61b33533..75901eaa4 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmX7uSbkNz76yNwBhuwYwRbhihLnJqM73VTCjS3UMJud9A/go-path"
+	ipfspath "gx/ipfs/Qmc17MNY1xUgiE2nopbi6KATWau9qcGZtdmKKuXvFMVUgc/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From ba7a34448e2bed4e26cc1feec81c5c98fe6cfbb6 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 24 Sep 2018 05:36:29 -0700
Subject: [PATCH 093/247] gx: update go-log go-ipld-cbor

(and friends)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@c1e241f73b853d5b8626125d24f8346c6331622b

This commit was moved from ipfs/boxo@3bff21ef38fb40c5920de6e475607cd6e31bf0e5
---
 core/coreiface/dht.go  | 4 ++--
 core/coreiface/key.go  | 2 +-
 core/coreiface/path.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 7b8119e44..2309ceb90 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
-	pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
+	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index cc7c409fd..4305ae20d 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 75901eaa4..0beab0663 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/Qmc17MNY1xUgiE2nopbi6KATWau9qcGZtdmKKuXvFMVUgc/go-path"
+	ipfspath "gx/ipfs/QmcjwUb36Z16NJkvDX6ccXPqsFswo6AsRXynyXcLLCphV2/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 8404b8263de39467bda064cdce59293db5914a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 18:54:58 +0100
Subject: [PATCH 094/247] coreapi: swarm interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@bc2ae0a441ed2da875bf2d815766e90b2c2a4d9f

This commit was moved from ipfs/boxo@398a8ffdf544dac64be994ce4a34ef3013d9d584
---
 core/coreiface/swarm.go | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 core/coreiface/swarm.go

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
new file mode 100644
index 000000000..1ec260e07
--- /dev/null
+++ b/core/coreiface/swarm.go
@@ -0,0 +1,37 @@
+package iface
+
+import (
+	"time"
+
+	"context"
+	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
+	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+)
+
+// PeerInfo contains information about a peer
+type PeerInfo interface {
+	// ID returns PeerID
+	ID() peer.ID
+
+	// Address returns the multiaddress via which we are connected with the peer
+	Address() ma.Multiaddr
+
+	// Latency returns last known round trip time to the peer
+	Latency() time.Duration
+
+	// Streams returns list of streams established with the peer
+	// TODO: should this return multicodecs?
+	Streams() []string
+}
+
+// SwarmAPI specifies the interface to libp2p swarm
+type SwarmAPI interface {
+	// Connect to a given address
+	Connect(context.Context, ma.Multiaddr) error
+
+	// Disconnect from a given address
+	Disconnect(context.Context, ma.Multiaddr) error
+
+	// Peers returns the list of peers we are connected to
+	Peers(context.Context) ([]PeerInfo, error)
+}

From fc8386301bc0534bac90eeb0b1c3b7b4a908a0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:02:57 +0100
Subject: [PATCH 095/247] coreapi: implement swarm api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3ab7f14240700d0e64e011e5fca7c847afc9ce9e

This commit was moved from ipfs/boxo@81615a9f48e0bba90d04b4ac389948124aeff053
---
 core/coreiface/coreapi.go | 3 +++
 core/coreiface/swarm.go   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 0053d472e..0b153b6f9 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -34,6 +34,9 @@ type CoreAPI interface {
 	// Dht returns an implementation of Dht API
 	Dht() DhtAPI
 
+	// Swarm returns an implementation of Swarm API
+	Swarm() SwarmAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (ResolvedPath, error)
 
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 1ec260e07..1f0b1216f 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
+	"context"
 	"time"
 
-	"context"
 	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
 	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
 )
@@ -17,11 +17,11 @@ type PeerInfo interface {
 	Address() ma.Multiaddr
 
 	// Latency returns last known round trip time to the peer
-	Latency() time.Duration
+	Latency(context.Context) (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
 	// TODO: should this return multicodecs?
-	Streams() []string
+	Streams(context.Context) ([]string, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm

From e839e46e938487e891dfea804e4ae18bddbefb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 5 Apr 2018 20:22:49 +0200
Subject: [PATCH 096/247] fix infinite loop in connInfo.ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@89ce6041ad9b851959cdd2434d4f7ab375459599

This commit was moved from ipfs/boxo@7e79c2365ce422f3c26401f2a0c8e1da99515aaf
---
 core/coreiface/swarm.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 1f0b1216f..92817e6f4 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
-	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 )
 
 // PeerInfo contains information about a peer

From 619855cc7a6f166359654b6ac2e6b1e0efcbe000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 20:50:15 +0200
Subject: [PATCH 097/247] swarm cmd: port to new cmd lib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@59f549fe3aa60f48303f6283e09ae05c9224a84c

This commit was moved from ipfs/boxo@6e9149c6f900ec598b0345cc97b0979b53ba8cb0
---
 core/coreiface/swarm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 92817e6f4..2492f2696 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
+	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 // PeerInfo contains information about a peer

From 284fd898dc3cf0f88b5816cb53d87d41676e9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 17 Sep 2018 16:45:59 +0200
Subject: [PATCH 098/247] coreapi swarm: rewire connect/disconnect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a48b2a807b98f5fe7eb4c1148bf938498a4836ce

This commit was moved from ipfs/boxo@0f6f6ec8a4e5b41f01c658bf46f4d30b69a7ade5
---
 core/coreiface/swarm.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 2492f2696..7bd009f16 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -2,14 +2,22 @@ package iface
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
 )
 
-// PeerInfo contains information about a peer
-type PeerInfo interface {
+var (
+	ErrNotConnected = errors.New("not connected")
+	ErrConnNotFound = errors.New("conn not found")
+	)
+
+// ConnectionInfo contains information about a peer
+type ConnectionInfo interface {
 	// ID returns PeerID
 	ID() peer.ID
 
@@ -20,18 +28,17 @@ type PeerInfo interface {
 	Latency(context.Context) (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
-	// TODO: should this return multicodecs?
-	Streams(context.Context) ([]string, error)
+	Streams(context.Context) ([]protocol.ID, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm
 type SwarmAPI interface {
-	// Connect to a given address
-	Connect(context.Context, ma.Multiaddr) error
+	// Connect to a given peer
+	Connect(context.Context, pstore.PeerInfo) error
 
 	// Disconnect from a given address
 	Disconnect(context.Context, ma.Multiaddr) error
 
 	// Peers returns the list of peers we are connected to
-	Peers(context.Context) ([]PeerInfo, error)
+	Peers(context.Context) ([]ConnectionInfo, error)
 }

From cb1f0c550ff5acbde160286b46a5a18d9a4393df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 17 Sep 2018 19:53:15 +0200
Subject: [PATCH 099/247] coreapi swarm: rewire address listing cmds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8c35696f74f086858b6acaf8ee6a0ffe570e46cb

This commit was moved from ipfs/boxo@4020059a81eb3f31fec83c825d6ce4d9dd8c65c4
---
 core/coreiface/key.go   |  3 +++
 core/coreiface/swarm.go | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 4305ae20d..cc6dc8900 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -33,6 +33,9 @@ type KeyAPI interface {
 	// List lists keys stored in keystore
 	List(ctx context.Context) ([]Key, error)
 
+	// Self returns the 'main' node key
+	Self(ctx context.Context) (Key, error)
+
 	// Remove removes keys from keystore. Returns ipns path of the removed key
 	Remove(ctx context.Context, name string) (Key, error)
 }
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 7bd009f16..caa6a70e3 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -9,12 +9,13 @@ import (
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
+	net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
 )
 
 var (
 	ErrNotConnected = errors.New("not connected")
 	ErrConnNotFound = errors.New("conn not found")
-	)
+)
 
 // ConnectionInfo contains information about a peer
 type ConnectionInfo interface {
@@ -24,6 +25,9 @@ type ConnectionInfo interface {
 	// Address returns the multiaddress via which we are connected with the peer
 	Address() ma.Multiaddr
 
+	// Direction returns which way the connection was established
+	Direction() net.Direction
+
 	// Latency returns last known round trip time to the peer
 	Latency(context.Context) (time.Duration, error)
 
@@ -41,4 +45,8 @@ type SwarmAPI interface {
 
 	// Peers returns the list of peers we are connected to
 	Peers(context.Context) ([]ConnectionInfo, error)
+
+	KnownAddrs(context.Context) (map[peer.ID][]ma.Multiaddr, error)
+	LocalAddrs(context.Context) ([]ma.Multiaddr, error)
+	ListenAddrs(context.Context) ([]ma.Multiaddr, error)
 }

From a95fe8e687f56947c1356ee4f10739c541e64891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Oct 2018 12:31:50 +0200
Subject: [PATCH 100/247] coreapi swarm: missing docs, review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@162cac0144b96596576bc9ec7389afaa8eb56135

This commit was moved from ipfs/boxo@9df903d67183fbb9c9ae66de11a4c62f92f7c1ee
---
 core/coreiface/swarm.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index caa6a70e3..8b464e5c1 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -29,10 +29,10 @@ type ConnectionInfo interface {
 	Direction() net.Direction
 
 	// Latency returns last known round trip time to the peer
-	Latency(context.Context) (time.Duration, error)
+	Latency() (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
-	Streams(context.Context) ([]protocol.ID, error)
+	Streams() ([]protocol.ID, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm
@@ -46,7 +46,12 @@ type SwarmAPI interface {
 	// Peers returns the list of peers we are connected to
 	Peers(context.Context) ([]ConnectionInfo, error)
 
+	// KnownAddrs returns the list of all addresses this node is aware of
 	KnownAddrs(context.Context) (map[peer.ID][]ma.Multiaddr, error)
+
+	// LocalAddrs returns the list of announced listening addresses
 	LocalAddrs(context.Context) ([]ma.Multiaddr, error)
+
+	// ListenAddrs returns the list of all listening addresses
 	ListenAddrs(context.Context) ([]ma.Multiaddr, error)
 }

From 99c68ac8c97652369fa2eceac144e81f8177bd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 19 Sep 2018 23:40:45 +0200
Subject: [PATCH 101/247] Cleanup instances of manual resolver construction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@47db102ccd13e62f40e7372b56b33dcf33e63c60

This commit was moved from ipfs/boxo@b7e28a936c5c9edee31e262c366c30fde7d872ab
---
 core/coreiface/util.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/util.go b/core/coreiface/util.go
index 8fd3e058f..6d58bf40d 100644
--- a/core/coreiface/util.go
+++ b/core/coreiface/util.go
@@ -1,10 +1,20 @@
 package iface
 
 import (
+	"context"
 	"io"
 )
 
 type Reader interface {
-	io.ReadSeeker
-	io.Closer
+	ReadSeekCloser
+	Size() uint64
+	CtxReadFull(context.Context, []byte) (int, error)
+}
+
+// A ReadSeekCloser implements interfaces to read, copy, seek and close.
+type ReadSeekCloser interface {
+	io.Reader
+	io.Seeker
+	io.Closer
+	io.WriterTo
 }

From 7d9ebdcebe6a0691a0921c167b2c513037b1cebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 15:00:51 +0200
Subject: [PATCH 102/247] coreapi unixfs: use fileAdder directly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@78136afef00445d43c96ec7c66249b881dcf95ff

This commit was moved from ipfs/boxo@60c358b08ca8bbb2773d19533ddd9b9864f3d360
---
 core/coreiface/options/unixfs.go | 50 ++++++++++++++++++++++++++++++++
 core/coreiface/unixfs.go         |  4 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 core/coreiface/options/unixfs.go

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
new file mode 100644
index 000000000..8dc9806a7
--- /dev/null
+++ b/core/coreiface/options/unixfs.go
@@ -0,0 +1,50 @@
+package options
+
+import (
+	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+)
+
+type UnixfsAddSettings struct {
+	CidVersion int
+	MhType     uint64
+
+	InlineLimit int
+}
+
+type UnixfsAddOption func(*UnixfsAddSettings) error
+
+func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
+	options := &UnixfsAddSettings{
+		CidVersion: -1,
+		MhType:     mh.SHA2_256,
+
+		InlineLimit: 0,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+type unixfsOpts struct{}
+
+var Unixfs unixfsOpts
+
+func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.CidVersion = version
+		return nil
+	}
+}
+
+func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.MhType = mhtype
+		return nil
+	}
+}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 4a3aff6fc..10febd9fa 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,13 +4,15 @@ import (
 	"context"
 	"io"
 
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.Reader) (ResolvedPath, error)
+	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)
 
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)

From d7afe85fe0523066da04d3274cd6f048328ca12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 15:59:53 +0200
Subject: [PATCH 103/247] coreapi unixfs: cid prefix options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@6c7f760b5d8ae479518992b322a7bd1ccc406247

This commit was moved from ipfs/boxo@0df36df660ece10808c7af055b59cd7052aaa7cf
---
 core/coreiface/options/unixfs.go | 8 ++++++--
 core/coreiface/unixfs.go         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 8dc9806a7..ffed75577 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -8,7 +8,9 @@ type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
 
-	InlineLimit int
+	InlineLimit  int
+	RawLeaves    bool
+	RawLeavesSet bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -18,7 +20,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
 
-		InlineLimit: 0,
+		InlineLimit:  0,
+		RawLeaves:    false,
+		RawLeavesSet: false,
 	}
 
 	for _, opt := range opts {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 10febd9fa..acc3b960c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -10,6 +10,7 @@ import (
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
+// NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
 	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)

From 9e57389b045a5202e2c91037d9cfaa87df751729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 16:19:32 +0200
Subject: [PATCH 104/247] coreapi unixfs: options for RawLeaves / Inline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@dbdf6fd63ad66e3b5e5649a349ee9ba9534590a0

This commit was moved from ipfs/boxo@6a3bc40fc4c131b19837c1007ba3e65a51de6ab1
---
 core/coreiface/options/unixfs.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index ffed75577..3c46ed086 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -52,3 +52,18 @@ func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.RawLeaves = enable
+		settings.RawLeavesSet = true
+		return nil
+	}
+}
+
+func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.InlineLimit = limit
+		return nil
+	}
+}

From 82ef32dcaf3619bc2d372ef0a634e56e159cc4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 16:40:31 +0200
Subject: [PATCH 105/247] coreapi unixfs: layout/chunker options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ee22ac438536720b2646e6071ecc6519f4161a0c

This commit was moved from ipfs/boxo@f858a5213f527b1ff67c45692c9e481301678398
---
 core/coreiface/options/unixfs.go | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 3c46ed086..fe41af9a8 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -4,6 +4,13 @@ import (
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 )
 
+type Layout int
+
+const (
+	BalancedLayout Layout = iota
+	TrickleLeyout
+)
+
 type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
@@ -11,6 +18,9 @@ type UnixfsAddSettings struct {
 	InlineLimit  int
 	RawLeaves    bool
 	RawLeavesSet bool
+
+	Chunker string
+	Layout  Layout
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -23,6 +33,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 		InlineLimit:  0,
 		RawLeaves:    false,
 		RawLeavesSet: false,
+
+		Chunker: "size-262144",
+		Layout:  BalancedLayout,
 	}
 
 	for _, opt := range opts {
@@ -67,3 +80,17 @@ func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Chunker = chunker
+		return nil
+	}
+}
+
+func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Layout = layout
+		return nil
+	}
+}

From ac8ff307329da34110495b69df9c003232f78c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:05:22 +0200
Subject: [PATCH 106/247] coreapi unixfs: pin/local/hash-only options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8521907e1a8ac009252669ad3e40be2d93438ad3

This commit was moved from ipfs/boxo@27ded0dea2d8b2ee4c115c9cd40c2d1514927162
---
 core/coreiface/options/unixfs.go | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index fe41af9a8..6012ce77b 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -21,6 +21,10 @@ type UnixfsAddSettings struct {
 
 	Chunker string
 	Layout  Layout
+
+	Pin      bool
+	OnlyHash bool
+	Local    bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -36,6 +40,10 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 
 		Chunker: "size-262144",
 		Layout:  BalancedLayout,
+
+		Pin:      false,
+		OnlyHash: false,
+		Local:    false,
 	}
 
 	for _, opt := range opts {
@@ -94,3 +102,24 @@ func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Pin = pin
+		return nil
+	}
+}
+
+func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.OnlyHash = hashOnly
+		return nil
+	}
+}
+
+func (unixfsOpts) Local(local bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Local = local
+		return nil
+	}
+}

From 7546c9386701ca6931a8bc0ac3fb202cace91015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:15:07 +0200
Subject: [PATCH 107/247] coreapi unixfs: cleanup options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e62f26507f22f00426172384461c53c7d14b702f

This commit was moved from ipfs/boxo@c3289a5e7d437768d5f1ea158a9e093034097c17
---
 core/coreiface/options/unixfs.go | 41 +++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6012ce77b..6abfd9622 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -1,7 +1,12 @@
 package options
 
 import (
+	"errors"
+	"fmt"
+
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+	dag "gx/ipfs/QmcBoNcAP6qDjgRBew7yjvCqHq7p5jMstE44jPUBWBxzsV/go-merkledag"
 )
 
 type Layout int
@@ -29,7 +34,7 @@ type UnixfsAddSettings struct {
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
 
-func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
+func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix, error) {
 	options := &UnixfsAddSettings{
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
@@ -49,11 +54,41 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 	for _, opt := range opts {
 		err := opt(options)
 		if err != nil {
-			return nil, err
+			return nil, cid.Prefix{}, err
 		}
 	}
 
-	return options, nil
+	// (hash != "sha2-256") -> CIDv1
+	if options.MhType != mh.SHA2_256 {
+		switch options.CidVersion {
+		case 0:
+			return nil, cid.Prefix{}, errors.New("CIDv0 only supports sha2-256")
+		case 1, -1:
+			options.CidVersion = 1
+		default:
+			return nil, cid.Prefix{}, fmt.Errorf("unknown CID version: %d", options.CidVersion)
+		}
+	} else {
+		if options.CidVersion < 0 {
+			// Default to CIDv0
+			options.CidVersion = 0
+		}
+	}
+
+	// cidV1 -> raw blocks (by default)
+	if options.CidVersion > 0 && !options.RawLeavesSet {
+		options.RawLeaves = true
+	}
+
+	prefix, err := dag.PrefixForCidVersion(options.CidVersion)
+	if err != nil {
+		return nil, cid.Prefix{}, err
+	}
+
+	prefix.MhType = options.MhType
+	prefix.MhLength = -1
+
+	return options, prefix, nil
 }
 
 type unixfsOpts struct{}

From 8cea9f91e4aa09596b657d00b5d07e1d7b9c1151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:44:49 +0200
Subject: [PATCH 108/247] coreapi unixfs: docs on options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@eeb50d8e478fbaff90d4ef5a434834abfff408ad

This commit was moved from ipfs/boxo@0039c7d460983de5c06f86459a0fb00b81ed0505
---
 core/coreiface/options/unixfs.go | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6abfd9622..9b003e1af 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -13,7 +13,7 @@ type Layout int
 
 const (
 	BalancedLayout Layout = iota
-	TrickleLeyout
+	TrickleLayout
 )
 
 type UnixfsAddSettings struct {
@@ -95,6 +95,8 @@ type unixfsOpts struct{}
 
 var Unixfs unixfsOpts
 
+// CidVersion specifies which CID version to use. Defaults to 0 unless an option
+// that depends on CIDv1 is passed.
 func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.CidVersion = version
@@ -102,6 +104,9 @@ func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
 	}
 }
 
+// Hash function to use. Implies CIDv1 if not set to sha2-256 (default).
+//
+// Table of functions is declared in https://github.com/multiformats/go-multihash/blob/master/multihash.go
 func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.MhType = mhtype
@@ -109,6 +114,8 @@ func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 	}
 }
 
+// RawLeaves specifies whether to use raw blocks for leaves (data nodes with no
+// links) instead of wrapping them with unixfs structures.
 func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.RawLeaves = enable
@@ -117,6 +124,11 @@ func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	}
 }
 
+// InlineLimit sets the amount of bytes below which blocks will be encoded
+// directly into CID instead of being stored and addressed by it's hash
+//
+// Note that while there is no hard limit on the number of bytes here, it should
+// be kept at something reasonably low like 32b (default for 'ipfs add')
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit
@@ -124,6 +136,11 @@ func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	}
 }
 
+// Chunker specifies settings for the chunking algorithm to use.
+//
+// Default: size-262144, formats:
+// size-[bytes] - Simple chunker splitting data into blocks of n bytes
+// rabin-[min]-[avg]-[max] - Rabin chunker
 func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Chunker = chunker
@@ -131,6 +148,10 @@ func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
 	}
 }
 
+// Layout tells the adder how to balance data between leaves.
+// options.BalancedLayout is the default, it's optimized for static seekable
+// files.
+// options.TrickleLayout is optimized for streaming data,
 func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Layout = layout
@@ -138,6 +159,7 @@ func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 	}
 }
 
+// Pin tells the adder to pin the file root recursively after adding
 func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Pin = pin
@@ -145,6 +167,8 @@ func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
 	}
 }
 
+// HashOnly will make the adder calculate data hash without storing it in the
+// blockstore or announcing it to the network
 func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.OnlyHash = hashOnly
@@ -152,6 +176,9 @@ func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	}
 }
 
+// Local will add the data to blockstore without announcing it to the network
+//
+// Note that this doesn't prevent other nodes from getting this data
 func (unixfsOpts) Local(local bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Local = local

From 33bb77072255f75e8a5a777069b9425a9f81e315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Oct 2018 09:42:50 +0200
Subject: [PATCH 109/247] coreapi unixfs: separate option to enable inlining
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@88ca0a07599ddd51c3db3864b99c1da87bf87eee

This commit was moved from ipfs/boxo@80a937abb79a84f303465f05d86b206e1e90ff75
---
 core/coreiface/options/unixfs.go | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 9b003e1af..df6f4fc71 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -20,6 +20,7 @@ type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
 
+	Inline       bool
 	InlineLimit  int
 	RawLeaves    bool
 	RawLeavesSet bool
@@ -39,7 +40,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
 
-		InlineLimit:  0,
+		Inline:       false,
+		InlineLimit:  32,
 		RawLeaves:    false,
 		RawLeavesSet: false,
 
@@ -124,11 +126,26 @@ func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	}
 }
 
+// Inline tells the adder to inline small blocks into CIDs
+func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Inline = enable
+		return nil
+	}
+}
+
 // InlineLimit sets the amount of bytes below which blocks will be encoded
-// directly into CID instead of being stored and addressed by it's hash
+// directly into CID instead of being stored and addressed by it's hash.
+// Specifying this option won't enable block inlining. For that use `Inline`
+// option. Default: 32 bytes
 //
-// Note that while there is no hard limit on the number of bytes here, it should
-// be kept at something reasonably low like 32b (default for 'ipfs add')
+// Note that while there is no hard limit on the number of bytes, it should
+// be kept at a reasonably low value, like 64 bytes if you intend to display
+// these hashes. Larger values like 256 bytes will work fine, but may affect
+// de-duplication of smaller blocks.
+//
+// Setting this value too high may cause various problems, such as render some
+// blocks unfetchable
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From d3bbffb3878a9fff3317ec4d439cb636dac9a153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 15:05:46 +0200
Subject: [PATCH 110/247] coreapi unixfs: multi file support in unixfs coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@9a760d89b5db34fa0fb7be8c71876e2f18dd8fa2

This commit was moved from ipfs/boxo@e50aac4cc71c5272b5a53994e958198286a585bc
---
 core/coreiface/unixfs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index acc3b960c..92168503e 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,10 +2,10 @@ package iface
 
 import (
 	"context"
-	"io"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
@@ -13,7 +13,7 @@ import (
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)
+	Add(context.Context, files.File, ...options.UnixfsAddOption) (ResolvedPath, error)
 
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)

From a7b89529611d0071f0be88d45c64aac557f95668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 17:21:07 +0200
Subject: [PATCH 111/247] coreapi unixfs: unixfs.Get
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@7b2fdc90ee0528d4c0a437d95b1cb0d10c3e8aa5

This commit was moved from ipfs/boxo@15a4331a185c812bab3e229758bcfc79d682ac5d
---
 core/coreiface/unixfs.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 92168503e..69e731822 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -13,8 +13,16 @@ import (
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
+	//
+	// TODO: a long useful comment on how to use this for many different scenarios
 	Add(context.Context, files.File, ...options.UnixfsAddOption) (ResolvedPath, error)
 
+	// Get returns a read-only handle to a file tree referenced by a path
+	//
+	// Note that some implementations of this API may apply the specified context
+	// to operations performed on the returned file
+	Get(context.Context, Path) (files.File, error)
+
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)
 

From ee45dafe78299ac3356a3a49b4ff63cac4c3530d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 22:30:45 +0200
Subject: [PATCH 112/247] coreapi unixfs: wrap option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@b977abfc696b22775fa68736c144760113b27af4

This commit was moved from ipfs/boxo@59fd418b398d9011c79167b82af869751acf2640
---
 core/coreiface/options/unixfs.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index df6f4fc71..abbea9681 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -31,6 +31,8 @@ type UnixfsAddSettings struct {
 	Pin      bool
 	OnlyHash bool
 	Local    bool
+
+	Wrap bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -51,6 +53,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Pin:      false,
 		OnlyHash: false,
 		Local:    false,
+
+		Wrap: false,
 	}
 
 	for _, opt := range opts {
@@ -202,3 +206,12 @@ func (unixfsOpts) Local(local bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Wrap tells the adder to wrap the added file structure with an additional
+// directory.
+func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Wrap = wrap
+		return nil
+	}
+}

From f10ca5c904954029737728199d48ba9346e614e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 22:49:42 +0200
Subject: [PATCH 113/247] coreapi unixfs: hidden opiton
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@cb84af4b44e4660029e87a1c82a3d2ab35acb2cd

This commit was moved from ipfs/boxo@1019fcea4b88f3a45cf81429f81066db1918771f
---
 core/coreiface/options/unixfs.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index abbea9681..7d7af5b81 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -32,7 +32,8 @@ type UnixfsAddSettings struct {
 	OnlyHash bool
 	Local    bool
 
-	Wrap bool
+	Wrap   bool
+	Hidden bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -54,7 +55,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		OnlyHash: false,
 		Local:    false,
 
-		Wrap: false,
+		Wrap:   false,
+		Hidden: false,
 	}
 
 	for _, opt := range opts {
@@ -215,3 +217,11 @@ func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Hidden enables adding of hidden files (files prefixed with '.')
+func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Hidden = hidden
+		return nil
+	}
+}

From 48761861ca82c2744d0c33d7bd41ef8f94abdb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 23:17:18 +0200
Subject: [PATCH 114/247] coreapi unixfs: stdin-name option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@aa7a877686c76f0767fa6fb618972b25f1545bb6

This commit was moved from ipfs/boxo@907d2f239738971d246b9ff9ce5add004adad2c7
---
 core/coreiface/options/unixfs.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 7d7af5b81..90ad53e9e 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -32,8 +32,9 @@ type UnixfsAddSettings struct {
 	OnlyHash bool
 	Local    bool
 
-	Wrap   bool
-	Hidden bool
+	Wrap      bool
+	Hidden    bool
+	StdinName string
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -55,8 +56,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		OnlyHash: false,
 		Local:    false,
 
-		Wrap:   false,
-		Hidden: false,
+		Wrap:      false,
+		Hidden:    false,
+		StdinName: "",
 	}
 
 	for _, opt := range opts {
@@ -225,3 +227,12 @@ func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// StdinName is the name set for files which don specify FilePath as
+// os.Stdin.Name()
+func (unixfsOpts) StdinName(name string) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.StdinName = name
+		return nil
+	}
+}

From be5cccd21ac577b26638e777d189a9f27df79058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 01:00:26 +0200
Subject: [PATCH 115/247] coreapi unixfs: progress events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@df1797113e1dc062a9e53af11b8ea4268c855ef9

This commit was moved from ipfs/boxo@56ef5340a321a06604f4f98efcba4da03b6a4358
---
 core/coreiface/options/unixfs.go | 35 ++++++++++++++++++++++++++++++++
 core/coreiface/unixfs.go         |  9 ++++++++
 2 files changed, 44 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 90ad53e9e..da99b42f6 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -35,6 +35,10 @@ type UnixfsAddSettings struct {
 	Wrap      bool
 	Hidden    bool
 	StdinName string
+
+	Events   chan<- interface{}
+	Silent   bool
+	Progress bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -59,6 +63,10 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Wrap:      false,
 		Hidden:    false,
 		StdinName: "",
+
+		Events:   nil,
+		Silent:   false,
+		Progress: false,
 	}
 
 	for _, opt := range opts {
@@ -236,3 +244,30 @@ func (unixfsOpts) StdinName(name string) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Events specifies channel which will be used to report events about ongoing
+// Add operation.
+//
+// Note that if this channel blocks it may slowdown the adder
+func (unixfsOpts) Events(sink chan<- interface{}) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Events = sink
+		return nil
+	}
+}
+
+// Silent reduces event output
+func (unixfsOpts) Silent(silent bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Silent = silent
+		return nil
+	}
+}
+
+// Progress tells the adder whether to enable progress events
+func (unixfsOpts) Progress(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Progress = enable
+		return nil
+	}
+}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 69e731822..c622e210e 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -9,6 +9,14 @@ import (
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
+// TODO: ideas on making this more coreapi-ish without breaking the http API?
+type AddEvent struct {
+	Name  string
+	Hash  string `json:",omitempty"`
+	Bytes int64  `json:",omitempty"`
+	Size  string `json:",omitempty"`
+}
+
 // UnixfsAPI is the basic interface to immutable files in IPFS
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
@@ -24,6 +32,7 @@ type UnixfsAPI interface {
 	Get(context.Context, Path) (files.File, error)
 
 	// Cat returns a reader for the file
+	// TODO: Remove in favour of Get (if we use Get on a file we still have reader directly, so..)
 	Cat(context.Context, Path) (Reader, error)
 
 	// Ls returns the list of links in a directory

From dfb14f3974d44b6dd1670233c57d24552b9fbd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 01:24:57 +0200
Subject: [PATCH 116/247] coreapi unixfs: filestore opts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@97fb3e4d819ee3ee511a719da6d1bef4695a2dad

This commit was moved from ipfs/boxo@90e8604702cde52200882080a6a8b5b3e0818d13
---
 core/coreiface/options/unixfs.go | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index da99b42f6..810e3c6e8 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -31,6 +31,8 @@ type UnixfsAddSettings struct {
 	Pin      bool
 	OnlyHash bool
 	Local    bool
+	FsCache  bool
+	NoCopy   bool
 
 	Wrap      bool
 	Hidden    bool
@@ -59,6 +61,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Pin:      false,
 		OnlyHash: false,
 		Local:    false,
+		FsCache:  false,
+		NoCopy:   false,
 
 		Wrap:      false,
 		Hidden:    false,
@@ -76,6 +80,17 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		}
 	}
 
+	// nocopy -> rawblocks
+	if options.NoCopy && !options.RawLeaves {
+		// fixed?
+		if options.RawLeavesSet {
+			return nil, cid.Prefix{}, fmt.Errorf("nocopy option requires '--raw-leaves' to be enabled as well")
+		}
+
+		// No, satisfy mandatory constraint.
+		options.RawLeaves = true
+	}
+
 	// (hash != "sha2-256") -> CIDv1
 	if options.MhType != mh.SHA2_256 {
 		switch options.CidVersion {
@@ -271,3 +286,23 @@ func (unixfsOpts) Progress(enable bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// FsCache tells the adder to check the filestore for pre-existing blocks
+//
+// Experimental
+func (unixfsOpts) FsCache(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.FsCache = enable
+		return nil
+	}
+}
+
+// NoCopy tells the adder to add the files using filestore. Implies RawLeaves.
+//
+// Experimental
+func (unixfsOpts) Nocopy(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.NoCopy = enable
+		return nil
+	}
+}

From e59b75ae4394525d2902dfb8bffc89214ef5e759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 20:39:43 +0200
Subject: [PATCH 117/247] coreapi unixfs: fix inline doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@641542e1596817f70eeac14f87b3c49ef2d5e80a

This commit was moved from ipfs/boxo@f46082072957d0f4634a70baec4f0ef573c89408
---
 core/coreiface/options/unixfs.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 810e3c6e8..9249af895 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -170,13 +170,10 @@ func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
 // Specifying this option won't enable block inlining. For that use `Inline`
 // option. Default: 32 bytes
 //
-// Note that while there is no hard limit on the number of bytes, it should
-// be kept at a reasonably low value, like 64 bytes if you intend to display
-// these hashes. Larger values like 256 bytes will work fine, but may affect
-// de-duplication of smaller blocks.
-//
-// Setting this value too high may cause various problems, such as render some
-// blocks unfetchable
+// Note that while there is no hard limit on the number of bytes, it should be
+// kept at a reasonably low value, such as 64 and no more than 1k. Setting this
+// value too high may cause various problems, such as render some
+// blocks unfetchable.
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From 4c5803a3f45eb4c1ae769b0ffe0b4fc2f4300404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 22:11:17 +0200
Subject: [PATCH 118/247] coreapi name: add some missing options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@0ad4722d65f9b8a3021320835291d2161091fd63

This commit was moved from ipfs/boxo@34497dfcf9b4083f51925ee9e7b9ccd14c8f69ce
---
 core/coreiface/options/name.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index ba3691b03..c614db3ab 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -13,6 +13,10 @@ const (
 type NamePublishSettings struct {
 	ValidTime time.Duration
 	Key       string
+
+	TTL *time.Duration
+
+	AllowOffline bool
 }
 
 type NameResolveSettings struct {
@@ -29,6 +33,8 @@ func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error)
 	options := &NamePublishSettings{
 		ValidTime: DefaultNameValidTime,
 		Key:       "self",
+
+		AllowOffline: false,
 	}
 
 	for _, opt := range opts {
@@ -82,6 +88,24 @@ func (nameOpts) Key(key string) NamePublishOption {
 	}
 }
 
+// AllowOffline is an option for Name.Publish which specifies whether to allow
+// publishing when the node is offline. Default value is false
+func (nameOpts) AllowOffline(allow bool) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.AllowOffline = allow
+		return nil
+	}
+}
+
+// TTL is an option for Name.Publish which specifies the time duration the
+// published record should be cached for (caution: experimental).
+func (nameOpts) TTL(ttl time.Duration) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.TTL = &ttl
+		return nil
+	}
+}
+
 // Local is an option for Name.Resolve which specifies if the lookup should be
 // offline. Default value is false
 func (nameOpts) Local(local bool) NameResolveOption {

From db11d51180922f44d45cf15f274e7617d17cec12 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 3 Oct 2018 07:35:57 +0200
Subject: [PATCH 119/247] gx: update go-datastore, go-libp2p-swarm

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@b9309ab1a51ec1b68e8c5561b0f02a610fd93f97

This commit was moved from ipfs/boxo@b00a9c91219246fb5cb954b1a50578eeb009dcae
---
 core/coreiface/dht.go   | 2 +-
 core/coreiface/path.go  | 2 +-
 core/coreiface/swarm.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 2309ceb90..4a76f4d39 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
 	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
-	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 0beab0663..0f06e8cc2 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmcjwUb36Z16NJkvDX6ccXPqsFswo6AsRXynyXcLLCphV2/go-path"
+	ipfspath "gx/ipfs/QmbE9gr6c2FomTgc2pRZRTooHpchJ1uaZKremypyWJMV4t/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 8b464e5c1..58caf6759 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
+	net "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
+	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
-	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
-	net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
 )
 
 var (

From cd6d30548a305d5a32118c7dae7286c521fbbfa0 Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Thu, 4 Oct 2018 19:11:27 -0400
Subject: [PATCH 120/247] gx update go-libp2p-peerstore

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@c8a6219cf25b4dfc1208523ec0bb2ee2efc2d85d

This commit was moved from ipfs/boxo@0ef081eae1b8bdaf52870fe9f483ba05c7ca69ef
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 0f06e8cc2..5748bf465 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmbE9gr6c2FomTgc2pRZRTooHpchJ1uaZKremypyWJMV4t/go-path"
+	ipfspath "gx/ipfs/QmYh33CFYYEgQNSZ9PEP7ZN57dhErRZ7NfLS1BUA9GBBRk/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 59de96e6341ed97ed94bcebe098df14182fd289e Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Thu, 4 Oct 2018 19:32:33 -0400
Subject: [PATCH 121/247] gx update libp2p/go-buffer-pool

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@349cbd1463198c9a811b6cc3c09c44608cdd486d

This commit was moved from ipfs/boxo@3f8596df8b398139db13cb06f2c55c6738fc6528
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 5748bf465..63b15fb50 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmYh33CFYYEgQNSZ9PEP7ZN57dhErRZ7NfLS1BUA9GBBRk/go-path"
+	ipfspath "gx/ipfs/QmV4QxScV9Y7LbaWhHazFfRd8uyeUd4pAH8a7fFFbi5odJ/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 1aa388cb87a449376a0d003ca44fbdced70af394 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 4 Oct 2018 21:12:53 -0700
Subject: [PATCH 122/247] update unixfs inline option comment to give us room
 to change things

(addressing CR)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@7d577641499b51b4d98ae7e10fed2fd5bf9d516a

This commit was moved from ipfs/boxo@b06611e7da0ebaef24e0b3db614716c940882793
---
 core/coreiface/options/unixfs.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 9249af895..d486981c3 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -171,9 +171,8 @@ func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
 // option. Default: 32 bytes
 //
 // Note that while there is no hard limit on the number of bytes, it should be
-// kept at a reasonably low value, such as 64 and no more than 1k. Setting this
-// value too high may cause various problems, such as render some
-// blocks unfetchable.
+// kept at a reasonably low value, such as 64; implementations may choose to
+// reject anything larger.
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From f9a93470069c116015b79f33f105275896f9917a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:23:38 +0100
Subject: [PATCH 123/247] coreapi: pubsub interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ccaec46f3deaf46e20f9c265d5920f68251e4da4

This commit was moved from ipfs/boxo@f06c01e06b04ec7a27b0738f984e0f30b005c711
---
 core/coreiface/options/pubsub.go | 56 ++++++++++++++++++++++++++++++++
 core/coreiface/pubsub.go         | 51 +++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 core/coreiface/options/pubsub.go
 create mode 100644 core/coreiface/pubsub.go

diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
new file mode 100644
index 000000000..e276d7e4a
--- /dev/null
+++ b/core/coreiface/options/pubsub.go
@@ -0,0 +1,56 @@
+package options
+
+type PubSubPeersSettings struct {
+	Topic string
+}
+
+type PubSubSubscribeSettings struct {
+	Discover bool
+}
+
+type PubSubPeersOption func(*PubSubPeersSettings) error
+type PubSubSubscribeOption func(*PubSubSubscribeSettings) error
+
+func PubSubPeersOptions(opts ...PubSubPeersOption) (*PubSubPeersSettings, error) {
+	options := &PubSubPeersSettings{
+		Topic: "",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSettings, error) {
+	options := &PubSubSubscribeSettings{
+		Discover: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type PubSubOptions struct{}
+
+func (api *PubSubOptions) WithTopic(topic string) PubSubPeersOption {
+	return func(settings *PubSubPeersSettings) error {
+		settings.Topic = topic
+		return nil
+	}
+}
+
+func (api *PubSubOptions) WithDiscover(discover bool) PubSubSubscribeOption {
+	return func(settings *PubSubSubscribeSettings) error {
+		settings.Discover = discover
+		return nil
+	}
+}
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
new file mode 100644
index 000000000..f78734a09
--- /dev/null
+++ b/core/coreiface/pubsub.go
@@ -0,0 +1,51 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+)
+
+// PubSubSubscription is an active PubSub subscription
+type PubSubSubscription interface {
+	io.Closer
+
+	// Chan return incoming message channel
+	Chan(context.Context) <-chan PubSubMessage
+}
+
+// PubSubMessage is a single PubSub message
+type PubSubMessage interface {
+	// From returns id of a peer from which the message has arrived
+	From() peer.ID
+
+	// Data returns the message body
+	Data() []byte
+}
+
+// PubSubAPI specifies the interface to PubSub
+type PubSubAPI interface {
+	// Ls lists subscribed topics by name
+	Ls(context.Context) ([]string, error)
+
+	// Peers list peers we are currently pubsubbing with
+	// TODO: WithTopic
+	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
+
+	// WithTopic is an option for peers which specifies a topic filter for the
+	// function
+	WithTopic(topic string) options.PubSubPeersOption
+
+	// Publish a message to a given pubsub topic
+	Publish(context.Context, string, []byte) error
+
+	// Subscribe to messages on a given topic
+	Subscribe(context.Context, string) (PubSubSubscription, error)
+
+	// WithDiscover is an option for Subscribe which specifies whether to try to
+	// discover other peers subscribed to the same topic
+	WithDiscover(discover bool) options.PubSubSubscribeOption
+}

From 729bb03d1b244e9ec7e27a28fa347ec79c15ae0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:28:22 +0100
Subject: [PATCH 124/247] coreapi: implement pubsub api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@0d0069ff23a4dd26fa62fd91e5875b2526742da5

This commit was moved from ipfs/boxo@1b8732304c12b825e9a8fd69b51494c9c67f39d0
---
 core/coreiface/coreapi.go        |  3 +++
 core/coreiface/errors.go         |  2 +-
 core/coreiface/options/pubsub.go |  8 +++++---
 core/coreiface/pubsub.go         | 16 ++++------------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 0b153b6f9..bc889237b 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -37,6 +37,9 @@ type CoreAPI interface {
 	// Swarm returns an implementation of Swarm API
 	Swarm() SwarmAPI
 
+	// PubSub returns an implementation of PubSub API
+	PubSub() PubSubAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (ResolvedPath, error)
 
diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 81f978971..072275409 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -4,5 +4,5 @@ import "errors"
 
 var (
 	ErrIsDir   = errors.New("object is a directory")
-	ErrOffline = errors.New("can't resolve, ipfs node is offline")
+	ErrOffline = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
 )
diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
index e276d7e4a..f0a614d58 100644
--- a/core/coreiface/options/pubsub.go
+++ b/core/coreiface/options/pubsub.go
@@ -39,16 +39,18 @@ func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSett
 	return options, nil
 }
 
-type PubSubOptions struct{}
+type pubsubOpts struct{}
 
-func (api *PubSubOptions) WithTopic(topic string) PubSubPeersOption {
+var PubBub nameOpts
+
+func (pubsubOpts) Topic(topic string) PubSubPeersOption {
 	return func(settings *PubSubPeersSettings) error {
 		settings.Topic = topic
 		return nil
 	}
 }
 
-func (api *PubSubOptions) WithDiscover(discover bool) PubSubSubscribeOption {
+func (pubsubOpts) Discover(discover bool) PubSubSubscribeOption {
 	return func(settings *PubSubSubscribeSettings) error {
 		settings.Discover = discover
 		return nil
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index f78734a09..4b52ed6d6 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,15 +6,15 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
 type PubSubSubscription interface {
 	io.Closer
 
-	// Chan return incoming message channel
-	Chan(context.Context) <-chan PubSubMessage
+	// Next return the next incoming message
+	Next(context.Context) (PubSubMessage, error)
 }
 
 // PubSubMessage is a single PubSub message
@@ -35,17 +35,9 @@ type PubSubAPI interface {
 	// TODO: WithTopic
 	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
 
-	// WithTopic is an option for peers which specifies a topic filter for the
-	// function
-	WithTopic(topic string) options.PubSubPeersOption
-
 	// Publish a message to a given pubsub topic
 	Publish(context.Context, string, []byte) error
 
 	// Subscribe to messages on a given topic
-	Subscribe(context.Context, string) (PubSubSubscription, error)
-
-	// WithDiscover is an option for Subscribe which specifies whether to try to
-	// discover other peers subscribed to the same topic
-	WithDiscover(discover bool) options.PubSubSubscribeOption
+	Subscribe(context.Context, string, ...options.PubSubSubscribeOption) (PubSubSubscription, error)
 }

From 3f6b34dd1a4845caa7c781d07328d58e9beabbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 05:43:54 +0200
Subject: [PATCH 125/247] coreapi pubsub: add tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3f9a6ce3446d2d5746c6d9976c9325f1673c8e99

This commit was moved from ipfs/boxo@d23f749f57daa3b22c91036530b9430bfebec610
---
 core/coreiface/options/pubsub.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
index f0a614d58..c387d613d 100644
--- a/core/coreiface/options/pubsub.go
+++ b/core/coreiface/options/pubsub.go
@@ -41,7 +41,7 @@ func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSett
 
 type pubsubOpts struct{}
 
-var PubBub nameOpts
+var PubSub pubsubOpts
 
 func (pubsubOpts) Topic(topic string) PubSubPeersOption {
 	return func(settings *PubSubPeersSettings) error {

From d5d6e5c13bd0db3b26c5c06a050eda92dc6c1437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 12:52:40 +0200
Subject: [PATCH 126/247] pubsub cmd: switch to coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@706e552037bd75687b5ff0cedb9802bc7f2d4617

This commit was moved from ipfs/boxo@add2ae0705df01044239e9ed5691974847332408
---
 core/coreiface/pubsub.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 4b52ed6d6..4c9a1d73e 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
@@ -24,6 +24,12 @@ type PubSubMessage interface {
 
 	// Data returns the message body
 	Data() []byte
+
+	// Seq returns message identifier
+	Seq() []byte
+
+	// Topics returns list of topics this message was set to
+	Topics() []string
 }
 
 // PubSubAPI specifies the interface to PubSub

From 57fdb89f375e9a589d52e765d658b385ac28508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 26 Sep 2018 18:24:35 +0200
Subject: [PATCH 127/247] coreapi pubsub: fix review nits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@162e182a2c2f67c227b7dd4b3d661d3b15ca1d7b

This commit was moved from ipfs/boxo@0373c3c9aee429624a99c6a1c080027923ec6e6f
---
 core/coreiface/pubsub.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 4c9a1d73e..d7a21e02f 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -38,7 +38,6 @@ type PubSubAPI interface {
 	Ls(context.Context) ([]string, error)
 
 	// Peers list peers we are currently pubsubbing with
-	// TODO: WithTopic
 	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
 
 	// Publish a message to a given pubsub topic

From fae14756dcdbd3b313f0dd3e861db5cbb676bdab Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 5 Oct 2018 14:11:56 -0700
Subject: [PATCH 128/247] gx: update stuff

* go-datastore and friends: GetSize
* badger: new release, fewer allocations
* go-mplex: send fewer packets
* go-bitswap: pack multiple blocks in a single message, fewer allocations
* go-buffer-pool: replace the buffer pool from go-msgio
* yamux: fixed data race and uses go-buffer-pool for stream read-buffers to
  reduce memory and allocations.
* go-libp2p-secio: get rid of a hot-spot allocation
* go-libp2p-peerstore: reduced allocations (at the cost of some memory)

More?

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@144aa5240ff7e379b34dd0e1adf9f8c1e991b3cc

This commit was moved from ipfs/boxo@b77e7021ee4b2093d2e2a98f5274ace254a537e1
---
 core/coreiface/dht.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/swarm.go          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 4a76f4d39..3096c8fb7 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
+	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
 	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6a54b2d39..b4661b793 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmTGpm48qm4fUZ9E5hMXy4ZngJUYCMKu15rTMVR3BSEnPm/go-merkledag"
+	dag "gx/ipfs/QmXTw4By9FMZAt7qJm4JoJuNBrBgqMMzkS4AjKc4zqTUVd/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 63b15fb50..9bb46b4b4 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmV4QxScV9Y7LbaWhHazFfRd8uyeUd4pAH8a7fFFbi5odJ/go-path"
+	ipfspath "gx/ipfs/QmQmMu1vsgsjxyB8tzrA6ZTCTCLDLVaXMb4Q57r2v886Sx/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 58caf6759..d8bca395c 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	net "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
-	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
+	net "gx/ipfs/QmWUPYHpNv4YahaBYXovuEJttgfqcNcN9Gg4arhQYcRoqa/go-libp2p-net"
+	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"

From d54cf20f798baecd7ece7707ce5c14c0f54b2196 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 10 Oct 2018 14:06:57 +0100
Subject: [PATCH 129/247] gx: update go-buffer-pool

Turns out that `pool.Put(buf)` had to *allocate* because we needed to turn
`[]byte` into `interface{}`. Apparently, we've never done this correctly we just
never noticed because we never really used buffer pools extensively.

However, since migrating yamux to a buffer-pool backed buffer, this started
showing up in allocation profiles.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@54fd5775db59e6c0113851fb7556dd09adac4215

This commit was moved from ipfs/boxo@2bda31a93a5070433a41cff4799c0012f4d69460
---
 core/coreiface/dht.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/swarm.go          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 3096c8fb7..cb3362bb9 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
+	pstore "gx/ipfs/QmWtCpWB39Rzc2xTB75MKorsxNpo3TyecTEN24CJ3KVohE/go-libp2p-peerstore"
 	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index b4661b793..aaed6024e 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmXTw4By9FMZAt7qJm4JoJuNBrBgqMMzkS4AjKc4zqTUVd/go-merkledag"
+	dag "gx/ipfs/QmTpyXP1bsqJvyW5VcNmALPCb47VPJFy2T8icGASNy4ML1/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 9bb46b4b4..a11a46324 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmQmMu1vsgsjxyB8tzrA6ZTCTCLDLVaXMb4Q57r2v886Sx/go-path"
+	ipfspath "gx/ipfs/QmTy6VoHV2E5baEFDXbp1xmHhxSVff5qTSrTsoXxD1eB2P/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index d8bca395c..ba1a55698 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	net "gx/ipfs/QmWUPYHpNv4YahaBYXovuEJttgfqcNcN9Gg4arhQYcRoqa/go-libp2p-net"
-	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
+	net "gx/ipfs/QmSTaEYUgDe1r581hxyd2u9582Hgp3KX4wGwYbRqz2u9Qh/go-libp2p-net"
+	pstore "gx/ipfs/QmWtCpWB39Rzc2xTB75MKorsxNpo3TyecTEN24CJ3KVohE/go-libp2p-peerstore"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"

From b3ad18600c88c12fb6fc247ec8aa7acb20e1e0bf Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 12 Oct 2018 16:15:40 +0100
Subject: [PATCH 130/247] gx: update yamux and refmt

* yamux: fix memory leak.
* refmt: obey the "empty" tag.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@cb4d2fb72ce804cc5c277ac8d6b1b10a63943072

This commit was moved from ipfs/boxo@f3066c9cd309e9af638a8c03d9967776254d5d65
---
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index aaed6024e..307d618de 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmTpyXP1bsqJvyW5VcNmALPCb47VPJFy2T8icGASNy4ML1/go-merkledag"
+	dag "gx/ipfs/QmVvNkTCx8V9Zei8xuTYTBdUXmbnDRS4iNuw1SztYyhQwQ/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index a11a46324..d90f04aa1 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmTy6VoHV2E5baEFDXbp1xmHhxSVff5qTSrTsoXxD1eB2P/go-path"
+	ipfspath "gx/ipfs/QmdrpbDgeYH3VxkCciQCJY5LkDYdXtig6unDzQmMxFtWEw/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 45b9ac582df7c77466cb7cb0464dede2554c1e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 16 Oct 2018 11:41:00 +0200
Subject: [PATCH 131/247] namesys: review fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@f660979841b69c6f91ff258b2eb90695dae98e75

This commit was moved from ipfs/boxo@6aaeb7276d4aa93de22390a6abf730231d75bbf3
---
 core/coreiface/name.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 14127ac27..782f68351 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -2,7 +2,6 @@ package iface
 
 import (
 	"context"
-
 	"errors"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"

From cfb18be463a1be895ec794d1a0f57c8e256a2884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 16 Oct 2018 16:35:31 +0200
Subject: [PATCH 132/247] namesys: drop prefix args
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1308d71ad0a2b782fd9b7f481ffe7789b30b8a29

This commit was moved from ipfs/boxo@183798effb213f1913b8c3702a89b5a026077e7a
---
 core/coreiface/name.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 782f68351..a02bc0787 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -40,7 +40,7 @@ type NameAPI interface {
 	// Search is a version of Resolve which outputs paths as they are discovered,
 	// reducing the time to first entry
 	//
-	// Note that by default only the last path returned before the channel closes
-	// can be considered 'safe'.
+	// Note: by default, all paths read from the channel are considered unsafe,
+	// except the latest (last path in channel read buffer).
 	Search(ctx context.Context, name string, opts ...options.NameResolveOption) (<-chan IpnsResult, error)
 }

From 9a680c8fe31e4ad43e7812f82bd257f5dc538c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 18 Oct 2018 10:16:31 +0200
Subject: [PATCH 133/247] gx: update to use extracted go-ipfs-files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a945dc346666180846b543c15cf1a7cb3d25d7bd

This commit was moved from ipfs/boxo@7af2ed03ee8171a3a4bf3d943fc50953f5390acd
---
 core/coreiface/unixfs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index c622e210e..078d648bc 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
+	files "gx/ipfs/QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC/go-ipfs-files"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 

From 278701f8d1c35e7b6541e739a98e639060e4a29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 9 Oct 2018 18:57:25 +0200
Subject: [PATCH 134/247] coreapi unixfs: remove Cat, use sessions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@26985dbeb71dc2999d2640c301cc88b2e1e56b72

This commit was moved from ipfs/boxo@83af9fbde0491d60155e511ad14d2e20068fd753
---
 core/coreiface/unixfs.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 078d648bc..4a6c956a0 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -31,10 +31,6 @@ type UnixfsAPI interface {
 	// to operations performed on the returned file
 	Get(context.Context, Path) (files.File, error)
 
-	// Cat returns a reader for the file
-	// TODO: Remove in favour of Get (if we use Get on a file we still have reader directly, so..)
-	Cat(context.Context, Path) (Reader, error)
-
 	// Ls returns the list of links in a directory
 	Ls(context.Context, Path) ([]*ipld.Link, error)
 }

From 7301aaa1201e6ecdff3d9ef82d66d957cc917d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 15 Oct 2018 12:45:49 +0200
Subject: [PATCH 135/247] coreapi unixfs: Return seeker from get
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@7fad9653969f1e71a85778e3e4e225c97d71558b

This commit was moved from ipfs/boxo@8d4196176a99ab51bfd521afbd061bfcf456354f
---
 core/coreiface/unixfs.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 4a6c956a0..dd7e5a392 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+	"io"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
@@ -17,6 +18,11 @@ type AddEvent struct {
 	Size  string `json:",omitempty"`
 }
 
+type UnixfsFile interface {
+	files.SizeFile
+	io.Seeker
+}
+
 // UnixfsAPI is the basic interface to immutable files in IPFS
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
@@ -29,7 +35,7 @@ type UnixfsAPI interface {
 	//
 	// Note that some implementations of this API may apply the specified context
 	// to operations performed on the returned file
-	Get(context.Context, Path) (files.File, error)
+	Get(context.Context, Path) (UnixfsFile, error)
 
 	// Ls returns the list of links in a directory
 	Ls(context.Context, Path) ([]*ipld.Link, error)

From e6dbe550bc31a8f23aba03c561d6f847dee9ad31 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 24 Oct 2018 09:59:18 -0700
Subject: [PATCH 136/247] gx update

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@c9eb6014a863a96f762fd87274a63ff906da0c65

This commit was moved from ipfs/boxo@10afc1c6e7946a55faeacc943f1aa6802530796b
---
 core/coreiface/dht.go            | 4 ++--
 core/coreiface/key.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/pubsub.go         | 2 +-
 core/coreiface/swarm.go          | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index cb3362bb9..38a0f7348 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmWtCpWB39Rzc2xTB75MKorsxNpo3TyecTEN24CJ3KVohE/go-libp2p-peerstore"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
+	pstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index cc6dc8900..9e7bfee28 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	"gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 307d618de..8fe172fea 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmVvNkTCx8V9Zei8xuTYTBdUXmbnDRS4iNuw1SztYyhQwQ/go-merkledag"
+	dag "gx/ipfs/QmY5xpETYHq3PPvaJnafyLWKqk5y7cZnUeBqLRtLUpEV3s/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index d90f04aa1..53938c3de 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmdrpbDgeYH3VxkCciQCJY5LkDYdXtig6unDzQmMxFtWEw/go-path"
+	ipfspath "gx/ipfs/QmayGyPXjTt3cGzjCR3wb5HsHQX7LaJcWUbZemGDn6rKWq/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index d7a21e02f..b3f3f6b76 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index ba1a55698..d4b92c017 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
-	net "gx/ipfs/QmSTaEYUgDe1r581hxyd2u9582Hgp3KX4wGwYbRqz2u9Qh/go-libp2p-net"
-	pstore "gx/ipfs/QmWtCpWB39Rzc2xTB75MKorsxNpo3TyecTEN24CJ3KVohE/go-libp2p-peerstore"
-	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
+	ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr"
+	"gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
+	pstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore"
+	net "gx/ipfs/QmXuRkCR7BNQa9uqfpTiFWsTQLzmTWYg91Ja1w95gnqb6u/go-libp2p-net"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 var (

From 07161dee3ee30e4cbb13caa39737787662188eaa Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 24 Oct 2018 12:49:25 -0700
Subject: [PATCH 137/247] gx update go-libp2p

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@da1f68d4e43463145f44894cbb8cf5d5a992f8d3

This commit was moved from ipfs/boxo@8cdb97d783313ce8276610860ec005d66e395cb5
---
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 8fe172fea..4d179f9ff 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmY5xpETYHq3PPvaJnafyLWKqk5y7cZnUeBqLRtLUpEV3s/go-merkledag"
+	dag "gx/ipfs/QmcescwzzD86xrxoXNJ6VwSw46wLC91QzFDnozYRVf4KnX/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 53938c3de..44d53f23c 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmayGyPXjTt3cGzjCR3wb5HsHQX7LaJcWUbZemGDn6rKWq/go-path"
+	ipfspath "gx/ipfs/QmQ4sKWqHhSYekzST5RwT4VHdQB4df6JWLHNy7tuWTo8uY/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 213fdce4feca11e9d02d837e94e695010f5d770d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 24 Oct 2018 15:01:31 -0700
Subject: [PATCH 138/247] gx: update yamux

(fixes a panic due to a race)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@edab11e8dd939a1f41567c663c20e79a334c38f3

This commit was moved from ipfs/boxo@7e7e70c7ef59b3024e7030f93d9b24f7697a4b51
---
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 4d179f9ff..f564d2427 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmcescwzzD86xrxoXNJ6VwSw46wLC91QzFDnozYRVf4KnX/go-merkledag"
+	dag "gx/ipfs/QmY8BMUSpCwNiTmFhACmC9Bt1qT63cHP35AoQAus4x14qH/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 44d53f23c..eb976ebd8 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmQ4sKWqHhSYekzST5RwT4VHdQB4df6JWLHNy7tuWTo8uY/go-path"
+	ipfspath "gx/ipfs/QmRKuTyCzg7HFBcV1YUhzStroGtJSb8iWgyxfsDCwFhWTS/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 1cd4f200e9f6753e25efbf21f787b14859f2e52c Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hector@protocol.ai>
Date: Sat, 27 Oct 2018 03:30:18 +0200
Subject: [PATCH 139/247] Bubble deps

License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>


This commit was moved from ipfs/interface-go-ipfs-core@c21b863fa15557b64d4bdcc99a7134b28ac3ca05

This commit was moved from ipfs/boxo@95c39b6f72f1d32c0e68731b2a02e031ac941e02
---
 core/coreiface/coreapi.go        | 2 +-
 core/coreiface/dag.go            | 2 +-
 core/coreiface/object.go         | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/unixfs.go         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index bc889237b..b744a207a 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
+	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 06bb91dce..6cca5b9e6 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
+	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 6b355a302..229f69869 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -7,7 +7,7 @@ import (
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
-	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
+	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index f564d2427..8a9137887 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmY8BMUSpCwNiTmFhACmC9Bt1qT63cHP35AoQAus4x14qH/go-merkledag"
+	dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index eb976ebd8..5a3d1128b 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmRKuTyCzg7HFBcV1YUhzStroGtJSb8iWgyxfsDCwFhWTS/go-path"
+	ipfspath "gx/ipfs/QmZbQUht8hzKmQxLHnzY14WSuoQqYkR5mn4cunchyWPmhn/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index dd7e5a392..6fd33ad2c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
 	files "gx/ipfs/QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC/go-ipfs-files"
-	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // TODO: ideas on making this more coreapi-ish without breaking the http API?

From 7c9bf201dbfa5c1d9e5271e4f7c8a800539f4ac5 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 30 Oct 2018 08:48:49 -0700
Subject: [PATCH 140/247] coreapi: fix errisdir

JavaScript expects this to be "this dag node is a directory". I'm almost of a
mind to say "don't parse errors" but, well, we don't give any better
alternatives.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@dc979581ae4496d6e2c57a019cb133d780585df7

This commit was moved from ipfs/boxo@abd0d4dddf5f23500d65ce04ab82a0dd8b7baa74
---
 core/coreiface/errors.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 072275409..4ee3026ff 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -3,6 +3,6 @@ package iface
 import "errors"
 
 var (
-	ErrIsDir   = errors.New("object is a directory")
+	ErrIsDir   = errors.New("this dag node is a directory")
 	ErrOffline = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
 )

From a81292a58214577d336645132c21a57048ab443a Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 30 Oct 2018 09:27:41 -0700
Subject: [PATCH 141/247] gx: update go-path

fixes the changed path cat error causing the js-ipfs-api tests to fail

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@6fcff53bc29de056f4b948bb0bfaa468546d1c66

This commit was moved from ipfs/boxo@41c1c071623c7781041fb09e69c641db9642bc1d
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 5a3d1128b..79dac201d 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmZbQUht8hzKmQxLHnzY14WSuoQqYkR5mn4cunchyWPmhn/go-path"
+	ipfspath "gx/ipfs/QmT3rzed1ppXefourpmoZ7tyVQfsGPQZ1pHDngLmCvXxd3/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 1eb12c92ea12cd542f132203e9ddc46d21781da4 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 2 Nov 2018 13:16:34 -0700
Subject: [PATCH 142/247] gx: update go-ipld-cbor

(might as well do this at the same time)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@bca0017a7a95666fff03c83e4a8e38b51d6158f3

This commit was moved from ipfs/boxo@9054f4c4c977dda2774bcf8493b2087fbf097d4d
---
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 8a9137887..d541adac7 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag"
+	dag "gx/ipfs/QmXyuFW7at4r9dxRAbrPU9JpHW5aqngAFyxvyhvYjzxRKS/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 79dac201d..034bfffc3 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmT3rzed1ppXefourpmoZ7tyVQfsGPQZ1pHDngLmCvXxd3/go-path"
+	ipfspath "gx/ipfs/QmUB3RFRDctDp1k73mDJydzWiKdiuNHfyuoRPQeU52rWWT/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 3e33625fe336ffcc052f002259e8744d9fea78e4 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 2 Nov 2018 17:15:21 -0700
Subject: [PATCH 143/247] gx: update go-log and sha256

fixes #5709

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@1c6351bc2b6ca351b0aaf8f3a6eca43714af21e1

This commit was moved from ipfs/boxo@93332aaa1821369c585b86e957acd42a09d3f1dd
---
 core/coreiface/coreapi.go        | 2 +-
 core/coreiface/dag.go            | 2 +-
 core/coreiface/dht.go            | 4 ++--
 core/coreiface/key.go            | 2 +-
 core/coreiface/object.go         | 4 ++--
 core/coreiface/options/block.go  | 4 ++--
 core/coreiface/options/dag.go    | 2 +-
 core/coreiface/options/unixfs.go | 6 +++---
 core/coreiface/path.go           | 4 ++--
 core/coreiface/pubsub.go         | 2 +-
 core/coreiface/swarm.go          | 8 ++++----
 core/coreiface/unixfs.go         | 2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index b744a207a..bab4fc13b 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 6cca5b9e6..eb9e2da4a 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
 // DagOps groups operations that can be batched together
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 38a0f7348..c4eef9379 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
-	pstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore"
+	pstore "gx/ipfs/QmUymf8fJtideyv3z727BcZUifGBjMZMpCJqu3Gxk5aRUk/go-libp2p-peerstore"
+	peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 9e7bfee28..36a74688b 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
+	"gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 229f69869..ba6f5a95d 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
-	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
+	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 6603136f3..ea4ae26bb 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -2,8 +2,8 @@ package options
 
 import (
 	"fmt"
-	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
-	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
 type BlockPutSettings struct {
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
index 4fdff0489..9cccba585 100644
--- a/core/coreiface/options/dag.go
+++ b/core/coreiface/options/dag.go
@@ -3,7 +3,7 @@ package options
 import (
 	"math"
 
-	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
 
 type DagPutSettings struct {
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index d541adac7..9b0683a11 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
-	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmXyuFW7at4r9dxRAbrPU9JpHW5aqngAFyxvyhvYjzxRKS/go-merkledag"
+	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	dag "gx/ipfs/QmaDBne4KeY3UepeqSVKYpSmQGa3q9zP6x3LfVF2UjF3Hc/go-merkledag"
+	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 034bfffc3..f5e7aeb4c 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmUB3RFRDctDp1k73mDJydzWiKdiuNHfyuoRPQeU52rWWT/go-path"
+	ipfspath "gx/ipfs/QmRG3XuGwT7GYuAqgWDJBKTzdaHMwAnc1x7J2KHEXNHxzG/go-path"
 
-	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index b3f3f6b76..93e429574 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
+	peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index d4b92c017..b830a0817 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
-	ma "gx/ipfs/QmT4U94DnD8FRfqr21obWY32HLM5VExccPKMjQHofeYqr9/go-multiaddr"
-	"gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
-	pstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore"
-	net "gx/ipfs/QmXuRkCR7BNQa9uqfpTiFWsTQLzmTWYg91Ja1w95gnqb6u/go-libp2p-net"
+	ma "gx/ipfs/QmRKLtwMw131aK7ugC3G7ybpumMz78YrJe5dzneyindvG1/go-multiaddr"
+	net "gx/ipfs/QmRKbEchaYADxSCyyjhDh4cTrUby8ftXUb8MRLBTHQYupw/go-libp2p-net"
+	pstore "gx/ipfs/QmUymf8fJtideyv3z727BcZUifGBjMZMpCJqu3Gxk5aRUk/go-libp2p-peerstore"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	"gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
 )
 
 var (
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 6fd33ad2c..002635d99 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
 	files "gx/ipfs/QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC/go-ipfs-files"
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
 // TODO: ideas on making this more coreapi-ish without breaking the http API?

From 187f6a306b6fa567dc3bd0abd94e31dd4d57af9a Mon Sep 17 00:00:00 2001
From: hannahhoward <hannah@hannahhoward.net>
Date: Sat, 10 Nov 2018 18:37:06 -0800
Subject: [PATCH 144/247] Update go-ipfs-delay and assoc deps

License: MIT
Signed-off-by: hannahhoward <hannah@hannahhoward.net>


This commit was moved from ipfs/interface-go-ipfs-core@20ca7387bd766e8a03ba3d7675d4d611a3a3fdab

This commit was moved from ipfs/boxo@cd374fff52aec080e9faa17753d6fc104c1bd4ae
---
 core/coreiface/dht.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/swarm.go          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index c4eef9379..243f1292c 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmUymf8fJtideyv3z727BcZUifGBjMZMpCJqu3Gxk5aRUk/go-libp2p-peerstore"
+	pstore "gx/ipfs/QmQAGG1zxfePqj2t7bLxyN8AFccZ889DDR9Gn8kVLDrGZo/go-libp2p-peerstore"
 	peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
 )
 
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 9b0683a11..742aa6f9e 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmaDBne4KeY3UepeqSVKYpSmQGa3q9zP6x3LfVF2UjF3Hc/go-merkledag"
+	dag "gx/ipfs/QmcGt25mrjuB2kKW2zhPbXVZNHc4yoTDQ65NA8m6auP2f1/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index f5e7aeb4c..0545c30d7 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmRG3XuGwT7GYuAqgWDJBKTzdaHMwAnc1x7J2KHEXNHxzG/go-path"
+	ipfspath "gx/ipfs/QmVi2uUygezqaMTqs3Yzt5FcZFHJoYD4B7jQ2BELjj7ZuY/go-path"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index b830a0817..1ecb0bb5e 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
+	pstore "gx/ipfs/QmQAGG1zxfePqj2t7bLxyN8AFccZ889DDR9Gn8kVLDrGZo/go-libp2p-peerstore"
 	ma "gx/ipfs/QmRKLtwMw131aK7ugC3G7ybpumMz78YrJe5dzneyindvG1/go-multiaddr"
-	net "gx/ipfs/QmRKbEchaYADxSCyyjhDh4cTrUby8ftXUb8MRLBTHQYupw/go-libp2p-net"
-	pstore "gx/ipfs/QmUymf8fJtideyv3z727BcZUifGBjMZMpCJqu3Gxk5aRUk/go-libp2p-peerstore"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
+	net "gx/ipfs/QmenvQQy4bFGSiHJUGupVmCRHfetg5rH3vTp9Z2f6v2KXR/go-libp2p-net"
 )
 
 var (

From dda742853e04e8750589ad29a1bf3353aadbe730 Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Wed, 28 Nov 2018 17:21:36 -0500
Subject: [PATCH 145/247] Gx update go-merkledag and related deps.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@1f51fd41ce7d6160fa741a5c7699a3b5bb305540

This commit was moved from ipfs/boxo@33840cd7fb98e69e4a3795ad744faf3135dc9a9b
---
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 742aa6f9e..4d7b61a93 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmcGt25mrjuB2kKW2zhPbXVZNHc4yoTDQ65NA8m6auP2f1/go-merkledag"
+	dag "gx/ipfs/QmdURv6Sbob8TVW2tFFve9vcEWrSUgwPqeqnXyvYhLrkyd/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 0545c30d7..aa3b2d0c6 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmVi2uUygezqaMTqs3Yzt5FcZFHJoYD4B7jQ2BELjj7ZuY/go-path"
+	ipfspath "gx/ipfs/QmQtg7N4XjAk2ZYpBjjv8B6gQprsRekabHBCnF6i46JYKJ/go-path"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )

From f31d59e53839b6b5480309a1720725cb718399b4 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 7 Dec 2018 15:37:23 -0800
Subject: [PATCH 146/247] gx: update go-libp2p-peer

Reverts the changes that allowed small keys (ed25519 keys) to be inlined.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@2d2e05fe7cc9680e2a06a5f752e76666a17b5944

This commit was moved from ipfs/boxo@21152b6074f3bf08068a4f980775194769ba63e5
---
 core/coreiface/dht.go            | 4 ++--
 core/coreiface/key.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/pubsub.go         | 2 +-
 core/coreiface/swarm.go          | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 243f1292c..e39be92c5 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmQAGG1zxfePqj2t7bLxyN8AFccZ889DDR9Gn8kVLDrGZo/go-libp2p-peerstore"
-	peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
+	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 36a74688b..f310c3cc2 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
+	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 4d7b61a93..b771896bc 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmdURv6Sbob8TVW2tFFve9vcEWrSUgwPqeqnXyvYhLrkyd/go-merkledag"
+	dag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index aa3b2d0c6..57ef4c21b 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmQtg7N4XjAk2ZYpBjjv8B6gQprsRekabHBCnF6i46JYKJ/go-path"
+	ipfspath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 93e429574..867c8adc4 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
+	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 1ecb0bb5e..63d20f035 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
-	pstore "gx/ipfs/QmQAGG1zxfePqj2t7bLxyN8AFccZ889DDR9Gn8kVLDrGZo/go-libp2p-peerstore"
+	net "gx/ipfs/QmPtFaR7BWHLAjSwLh9kXcyrgTzDpuhcWLkx8ioa9RMYnx/go-libp2p-net"
 	ma "gx/ipfs/QmRKLtwMw131aK7ugC3G7ybpumMz78YrJe5dzneyindvG1/go-multiaddr"
+	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	"gx/ipfs/QmcqU6QUDSXprb1518vYDGczrTJTyGwLG9eUa5iNX4xUtS/go-libp2p-peer"
-	net "gx/ipfs/QmenvQQy4bFGSiHJUGupVmCRHfetg5rH3vTp9Z2f6v2KXR/go-libp2p-net"
 )
 
 var (

From 7505d2c4871eaa34dbf910902d3f43b1dfdbe0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 26 Oct 2018 14:14:49 +0200
Subject: [PATCH 147/247] gx: update go-ipfs-files to 2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1dc26f7a3fc0c1992e3c005177cecddb3fa8e14a

This commit was moved from ipfs/boxo@5a85a431f81b0ba3feb64c8adc814b09b7ebe4da
---
 core/coreiface/unixfs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 002635d99..3a214085c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	files "gx/ipfs/QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC/go-ipfs-files"
+	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 

From 20631f73bfece2e3c953e07c4a2473456ac9cd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 26 Oct 2018 15:56:30 +0200
Subject: [PATCH 148/247] files2.0: fix build errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@072259200527f4b78299675bb5efbbaa715ca821

This commit was moved from ipfs/boxo@d4352730fe649983c5c9099d4ba2fba2170451f6
---
 core/coreiface/unixfs.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 3a214085c..773b36dc0 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,9 +2,8 @@ package iface
 
 import (
 	"context"
-	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
@@ -18,11 +17,6 @@ type AddEvent struct {
 	Size  string `json:",omitempty"`
 }
 
-type UnixfsFile interface {
-	files.SizeFile
-	io.Seeker
-}
-
 // UnixfsAPI is the basic interface to immutable files in IPFS
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
@@ -35,7 +29,7 @@ type UnixfsAPI interface {
 	//
 	// Note that some implementations of this API may apply the specified context
 	// to operations performed on the returned file
-	Get(context.Context, Path) (UnixfsFile, error)
+	Get(context.Context, Path) (files.File, error)
 
 	// Ls returns the list of links in a directory
 	Ls(context.Context, Path) ([]*ipld.Link, error)

From 257add12aba544fb7bea36b972ffd8c9d8b709dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 19 Nov 2018 03:24:42 +0100
Subject: [PATCH 149/247] files2.0: updates for file type split
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@65f7599676af200b0b87cee47292e6a48b1c14eb

This commit was moved from ipfs/boxo@2904a69ad87f9a72ce9598c08536212a6d19609d
---
 core/coreiface/unixfs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 773b36dc0..589083c6b 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -23,13 +23,13 @@ type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
 	//
 	// TODO: a long useful comment on how to use this for many different scenarios
-	Add(context.Context, files.File, ...options.UnixfsAddOption) (ResolvedPath, error)
+	Add(context.Context, files.Node, ...options.UnixfsAddOption) (ResolvedPath, error)
 
 	// Get returns a read-only handle to a file tree referenced by a path
 	//
 	// Note that some implementations of this API may apply the specified context
 	// to operations performed on the returned file
-	Get(context.Context, Path) (files.File, error)
+	Get(context.Context, Path) (files.Node, error)
 
 	// Ls returns the list of links in a directory
 	Ls(context.Context, Path) ([]*ipld.Link, error)

From bee62f1823b1eb2c2cac33e60a449c3dd8ad69e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 18 Dec 2018 02:09:43 +0100
Subject: [PATCH 150/247] files2.0: address review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d68c62b157814c099608799f543888595fdb8fd5

This commit was moved from ipfs/boxo@0e2ab3797e3ea5f3d78d72f7f8b646e22772e2dd
---
 core/coreiface/errors.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 4ee3026ff..234abe566 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -4,5 +4,6 @@ import "errors"
 
 var (
 	ErrIsDir   = errors.New("this dag node is a directory")
+	ErrNotFile = errors.New("this dag node is not a regular file")
 	ErrOffline = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
 )

From f24ab99f72cfd21bd1db9c781da52ea0e9ca0945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 6 Dec 2018 10:47:51 +0100
Subject: [PATCH 151/247] coreapi: Global options for api constructor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@84509e38781da3257c7a82d09483b4c7d9188a10

This commit was moved from ipfs/boxo@3d132ddab18ee64dc731918e08fd4548d1b335dc
---
 core/coreiface/options/global.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 core/coreiface/options/global.go

diff --git a/core/coreiface/options/global.go b/core/coreiface/options/global.go
new file mode 100644
index 000000000..f43965229
--- /dev/null
+++ b/core/coreiface/options/global.go
@@ -0,0 +1,32 @@
+package options
+
+type ApiSettings struct {
+	Offline bool
+}
+
+type ApiOption func(*ApiSettings) error
+
+func ApiOptions(opts ...ApiOption) (*ApiSettings, error) {
+	options := &ApiSettings{
+		Offline: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type apiOpts struct{}
+
+var Api dagOpts
+
+func (dagOpts) Offline(offline bool) ApiOption {
+	return func(settings *ApiSettings) error {
+		settings.Offline = offline
+		return nil
+	}
+}

From 5da159b33c400648d67d20e25d17b23043fb590c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 10 Dec 2018 14:21:19 +0100
Subject: [PATCH 152/247] coreapi.WithOptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@7b478b88d1f788045344cede17f73e2f9b21d680

This commit was moved from ipfs/boxo@6d52ba5bb4ccdda79fb3a55fbc1d024bee208c6e
---
 core/coreiface/coreapi.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index bab4fc13b..226399967 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,6 +5,8 @@ package iface
 import (
 	"context"
 
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
@@ -46,4 +48,8 @@ type CoreAPI interface {
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
 	ResolveNode(context.Context, Path) (ipld.Node, error)
+
+	// WithOptions creates new instance of CoreAPI based on this instance with
+	// a set of options applied
+	WithOptions(...options.ApiOption) (CoreAPI, error)
 }

From 322654a45ffaaada90c2237e33212ca83898e6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 10 Dec 2018 14:31:19 +0100
Subject: [PATCH 153/247] coreapi: drop nameopt.Local in favour of api.Offline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@42d3b2edfa9d76d00e9fb2b86f6ab35ee15a0c0d

This commit was moved from ipfs/boxo@57bf11c1602f87c424c2b0309d89642ef6d7d0d0
---
 core/coreiface/options/name.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index c614db3ab..e2a0fc164 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -20,7 +20,6 @@ type NamePublishSettings struct {
 }
 
 type NameResolveSettings struct {
-	Local bool
 	Cache bool
 
 	ResolveOpts []ropts.ResolveOpt
@@ -49,7 +48,6 @@ func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error)
 
 func NameResolveOptions(opts ...NameResolveOption) (*NameResolveSettings, error) {
 	options := &NameResolveSettings{
-		Local: false,
 		Cache: true,
 	}
 
@@ -106,15 +104,6 @@ func (nameOpts) TTL(ttl time.Duration) NamePublishOption {
 	}
 }
 
-// Local is an option for Name.Resolve which specifies if the lookup should be
-// offline. Default value is false
-func (nameOpts) Local(local bool) NameResolveOption {
-	return func(settings *NameResolveSettings) error {
-		settings.Local = local
-		return nil
-	}
-}
-
 // Cache is an option for Name.Resolve which specifies if cache should be used.
 // Default value is true
 func (nameOpts) Cache(cache bool) NameResolveOption {

From 2230c18f333eb14d63641f437559da445366e42e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 10 Dec 2018 15:26:27 +0100
Subject: [PATCH 154/247] coreapi: implement --local with Offline option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@286ea29c95a4d398c9a4b08fc5d24494e0c5d7c1

This commit was moved from ipfs/boxo@3b8f8c7c8238d5fbd913ab0fb13f466ec3313e97
---
 core/coreiface/options/unixfs.go | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index b771896bc..fd748bb4a 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -30,7 +30,6 @@ type UnixfsAddSettings struct {
 
 	Pin      bool
 	OnlyHash bool
-	Local    bool
 	FsCache  bool
 	NoCopy   bool
 
@@ -60,7 +59,6 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 
 		Pin:      false,
 		OnlyHash: false,
-		Local:    false,
 		FsCache:  false,
 		NoCopy:   false,
 
@@ -220,16 +218,6 @@ func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	}
 }
 
-// Local will add the data to blockstore without announcing it to the network
-//
-// Note that this doesn't prevent other nodes from getting this data
-func (unixfsOpts) Local(local bool) UnixfsAddOption {
-	return func(settings *UnixfsAddSettings) error {
-		settings.Local = local
-		return nil
-	}
-}
-
 // Wrap tells the adder to wrap the added file structure with an additional
 // directory.
 func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {

From cd14497b17c5d772f183e4922552420e4999e304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Dec 2018 22:24:40 +0100
Subject: [PATCH 155/247] coreapi WithOptions: apply on top of parent options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3956a72f07973de428f73776571af0518872e87c

This commit was moved from ipfs/boxo@e84f354e2490ba03d16798213311feb0ef47b59c
---
 core/coreiface/options/global.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/global.go b/core/coreiface/options/global.go
index f43965229..93d635e41 100644
--- a/core/coreiface/options/global.go
+++ b/core/coreiface/options/global.go
@@ -11,6 +11,10 @@ func ApiOptions(opts ...ApiOption) (*ApiSettings, error) {
 		Offline: false,
 	}
 
+	return ApiOptionsTo(options, opts...)
+}
+
+func ApiOptionsTo(options *ApiSettings, opts ...ApiOption) (*ApiSettings, error) {
 	for _, opt := range opts {
 		err := opt(options)
 		if err != nil {
@@ -22,9 +26,9 @@ func ApiOptions(opts ...ApiOption) (*ApiSettings, error) {
 
 type apiOpts struct{}
 
-var Api dagOpts
+var Api apiOpts
 
-func (dagOpts) Offline(offline bool) ApiOption {
+func (apiOpts) Offline(offline bool) ApiOption {
 	return func(settings *ApiSettings) error {
 		settings.Offline = offline
 		return nil

From 1208d736c479be0d54acb55028d07cdcd541e2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 18 Dec 2018 14:23:55 +0100
Subject: [PATCH 156/247] coreapi/unixfs: Use path instead of raw hash in
 AddEvent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a1cf89b78a61aef35a4893f916e14e39cd5c9157

This commit was moved from ipfs/boxo@b5e06d34876da3759fa39fb18f557085e27f76d0
---
 core/coreiface/path.go   | 1 +
 core/coreiface/unixfs.go | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 57ef4c21b..01dda97d5 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -46,6 +46,7 @@ type ResolvedPath interface {
 	// cidRoot := {"A": {"/": cidA }}
 	//
 	// And resolve paths:
+	//
 	// * "/ipfs/${cidRoot}"
 	//   * Calling Cid() will return `cidRoot`
 	//   * Calling Root() will return `cidRoot`
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 589083c6b..b42b454cc 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -9,12 +9,11 @@ import (
 	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
-// TODO: ideas on making this more coreapi-ish without breaking the http API?
 type AddEvent struct {
 	Name  string
-	Hash  string `json:",omitempty"`
-	Bytes int64  `json:",omitempty"`
-	Size  string `json:",omitempty"`
+	Path  ResolvedPath `json:",omitempty"`
+	Bytes int64        `json:",omitempty"`
+	Size  string       `json:",omitempty"`
 }
 
 // UnixfsAPI is the basic interface to immutable files in IPFS

From e60f2ba563c6a5708ba08c8140ac517b206dfda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Dec 2018 19:45:58 +0100
Subject: [PATCH 157/247] coreapi: move tests to interface subpackage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a479105a40eddefc84ca1de9aaaf12cbe2e13e56

This commit was moved from ipfs/boxo@3301b037c33fd42e0deb10965447a7e26e1e86fa
---
 core/coreiface/tests/block_test.go  | 183 ++++++
 core/coreiface/tests/dag_test.go    | 151 +++++
 core/coreiface/tests/dht_test.go    | 126 ++++
 core/coreiface/tests/key_test.go    | 475 ++++++++++++++
 core/coreiface/tests/name_test.go   | 262 ++++++++
 core/coreiface/tests/object_test.go | 427 ++++++++++++
 core/coreiface/tests/path_test.go   | 154 +++++
 core/coreiface/tests/pin_test.go    | 214 +++++++
 core/coreiface/tests/pubsub_test.go | 106 +++
 core/coreiface/tests/unixfs_test.go | 963 ++++++++++++++++++++++++++++
 10 files changed, 3061 insertions(+)
 create mode 100644 core/coreiface/tests/block_test.go
 create mode 100644 core/coreiface/tests/dag_test.go
 create mode 100644 core/coreiface/tests/dht_test.go
 create mode 100644 core/coreiface/tests/key_test.go
 create mode 100644 core/coreiface/tests/name_test.go
 create mode 100644 core/coreiface/tests/object_test.go
 create mode 100644 core/coreiface/tests/path_test.go
 create mode 100644 core/coreiface/tests/pin_test.go
 create mode 100644 core/coreiface/tests/pubsub_test.go
 create mode 100644 core/coreiface/tests/unixfs_test.go

diff --git a/core/coreiface/tests/block_test.go b/core/coreiface/tests/block_test.go
new file mode 100644
index 000000000..81360b150
--- /dev/null
+++ b/core/coreiface/tests/block_test.go
@@ -0,0 +1,183 @@
+package tests_test
+
+import (
+	"context"
+	"io/ioutil"
+	"strings"
+	"testing"
+
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+)
+
+func TestBlockPut(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if res.Path().Cid().String() != "QmPyo15ynbVrSTVdJL9th7JysHaAbXt9dM9tXk1bMHbRtk" {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+func TestBlockPutFormat(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("cbor"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if res.Path().Cid().String() != "zdpuAn4amuLWo8Widi5v6VQpuo2dnpnwbVE3oB6qqs7mDSeoa" {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+func TestBlockPutHash(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Path().Cid().String() != "zBurKB9YZkcDf6xa53WBE8CFX4ydVqAyf9KPXBFZt5stJzEstaS8Hukkhu4gwpMtc1xHNDbzP7sPtQKyWsP3C8fbhkmrZ" {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+func TestBlockGet(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
+	if err != nil {
+		t.Error(err)
+	}
+
+	r, err := api.Block().Get(ctx, res.Path())
+	if err != nil {
+		t.Error(err)
+	}
+
+	d, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if string(d) != "Hello" {
+		t.Error("didn't get correct data back")
+	}
+
+	p, err := coreiface.ParsePath("/ipfs/" + res.Path().Cid().String())
+	if err != nil {
+		t.Error(err)
+	}
+
+	rp, err := api.ResolvePath(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if rp.Cid().String() != res.Path().Cid().String() {
+		t.Error("paths didn't match")
+	}
+}
+
+func TestBlockRm(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	r, err := api.Block().Get(ctx, res.Path())
+	if err != nil {
+		t.Error(err)
+	}
+
+	d, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if string(d) != "Hello" {
+		t.Error("didn't get correct data back")
+	}
+
+	err = api.Block().Rm(ctx, res.Path())
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Block().Get(ctx, res.Path())
+	if err == nil {
+		t.Error("expected err to exist")
+	}
+	if err.Error() != "blockservice: key not found" {
+		t.Errorf("unexpected error; %s", err.Error())
+	}
+
+	err = api.Block().Rm(ctx, res.Path())
+	if err == nil {
+		t.Error("expected err to exist")
+	}
+	if err.Error() != "blockstore: block not found" {
+		t.Errorf("unexpected error; %s", err.Error())
+	}
+
+	err = api.Block().Rm(ctx, res.Path(), opt.Block.Force(true))
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestBlockStat(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	stat, err := api.Block().Stat(ctx, res.Path())
+	if err != nil {
+		t.Error(err)
+	}
+
+	if stat.Path().String() != res.Path().String() {
+		t.Error("paths don't match")
+	}
+
+	if stat.Size() != len("Hello") {
+		t.Error("length doesn't match")
+	}
+}
diff --git a/core/coreiface/tests/dag_test.go b/core/coreiface/tests/dag_test.go
new file mode 100644
index 000000000..17059192b
--- /dev/null
+++ b/core/coreiface/tests/dag_test.go
@@ -0,0 +1,151 @@
+package tests_test
+
+import (
+	"context"
+	"path"
+	"strings"
+	"testing"
+
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+)
+
+var (
+	treeExpected = map[string]struct{}{
+		"a":   {},
+		"b":   {},
+		"c":   {},
+		"c/d": {},
+		"c/e": {},
+	}
+)
+
+func TestPut(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if res.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", res.Cid().String())
+	}
+}
+
+func TestPutWithHash(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`), opt.Dag.Hash(mh.ID, -1))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if res.Cid().String() != "z5hRLNd2sv4z1c" {
+		t.Errorf("got wrong cid: %s", res.Cid().String())
+	}
+}
+
+func TestPath(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	sub, err := api.Dag().Put(ctx, strings.NewReader(`"foo"`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+sub.Cid().String()+`"}}`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	p, err := coreiface.ParsePath(path.Join(res.Cid().String(), "lnk"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	nd, err := api.Dag().Get(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if nd.Cid().String() != sub.Cid().String() {
+		t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), sub.Cid().String())
+	}
+}
+
+func TestTree(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	c, err := api.Dag().Put(ctx, strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	res, err := api.Dag().Get(ctx, c)
+	if err != nil {
+		t.Error(err)
+	}
+
+	lst := res.Tree("", -1)
+	if len(lst) != len(treeExpected) {
+		t.Errorf("tree length of %d doesn't match expected %d", len(lst), len(treeExpected))
+	}
+
+	for _, ent := range lst {
+		if _, ok := treeExpected[ent]; !ok {
+			t.Errorf("unexpected tree entry %s", ent)
+		}
+	}
+}
+
+func TestBatch(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	batch := api.Dag().Batch(ctx)
+
+	c, err := batch.Put(ctx, strings.NewReader(`"Hello"`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if c.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", c.Cid().String())
+	}
+
+	_, err = api.Dag().Get(ctx, c)
+	if err == nil || err.Error() != "merkledag: not found" {
+		t.Error(err)
+	}
+
+	if err := batch.Commit(ctx); err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Dag().Get(ctx, c)
+	if err != nil {
+		t.Error(err)
+	}
+}
diff --git a/core/coreiface/tests/dht_test.go b/core/coreiface/tests/dht_test.go
new file mode 100644
index 000000000..be16bb083
--- /dev/null
+++ b/core/coreiface/tests/dht_test.go
@@ -0,0 +1,126 @@
+package tests_test
+
+import (
+	"context"
+	"io"
+	"testing"
+
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+func TestDhtFindPeer(t *testing.T) {
+	ctx := context.Background()
+	apis, err := makeAPISwarm(ctx, true, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	self0, err := apis[0].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pi, err := apis[2].Dht().FindPeer(ctx, self0.ID())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if pi.Addrs[0].String() != "/ip4/127.0.0.1/tcp/4001" {
+		t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
+	}
+
+	self2, err := apis[2].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pi, err = apis[1].Dht().FindPeer(ctx, self2.ID())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if pi.Addrs[0].String() != "/ip4/127.0.2.1/tcp/4001" {
+		t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
+	}
+}
+
+func TestDhtFindProviders(t *testing.T) {
+	ctx := context.Background()
+	apis, err := makeAPISwarm(ctx, true, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p, err := addTestObject(ctx, apis[0])
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	provider := <-out
+
+	self0, err := apis[0].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if provider.ID.String() != self0.ID().String() {
+		t.Errorf("got wrong provider: %s != %s", provider.ID.String(), self0.ID().String())
+	}
+}
+
+func TestDhtProvide(t *testing.T) {
+	ctx := context.Background()
+	apis, err := makeAPISwarm(ctx, true, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	off0, err := apis[0].WithOptions(options.Api.Offline(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	s, err := off0.Block().Put(ctx, &io.LimitedReader{R: rnd, N: 4092})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p := s.Path()
+
+	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	provider := <-out
+
+	self0, err := apis[0].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if provider.ID.String() != "<peer.ID >" {
+		t.Errorf("got wrong provider: %s != %s", provider.ID.String(), self0.ID().String())
+	}
+
+	err = apis[0].Dht().Provide(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	out, err = apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	provider = <-out
+
+	if provider.ID.String() != self0.ID().String() {
+		t.Errorf("got wrong provider: %s != %s", provider.ID.String(), self0.ID().String())
+	}
+}
diff --git a/core/coreiface/tests/key_test.go b/core/coreiface/tests/key_test.go
new file mode 100644
index 000000000..21884e448
--- /dev/null
+++ b/core/coreiface/tests/key_test.go
@@ -0,0 +1,475 @@
+package tests_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+func TestListSelf(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	keys, err := api.Key().List(ctx)
+	if err != nil {
+		t.Fatalf("failed to list keys: %s", err)
+		return
+	}
+
+	if len(keys) != 1 {
+		t.Fatalf("there should be 1 key (self), got %d", len(keys))
+		return
+	}
+
+	if keys[0].Name() != "self" {
+		t.Errorf("expected the key to be called 'self', got '%s'", keys[0].Name())
+	}
+
+	if keys[0].Path().String() != "/ipns/"+testPeerID {
+		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", testPeerID, keys[0].Path().String())
+	}
+}
+
+func TestRenameSelf(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, _, err = api.Key().Rename(ctx, "self", "foo")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot rename key with name 'self'" {
+			t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
+		}
+	}
+
+	_, _, err = api.Key().Rename(ctx, "self", "foo", opt.Key.Force(true))
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot rename key with name 'self'" {
+			t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestRemoveSelf(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, err = api.Key().Remove(ctx, "self")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot remove key with name 'self'" {
+			t.Fatalf("expected error 'cannot remove key with name 'self'', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestGenerate(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	k, err := api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if k.Name() != "foo" {
+		t.Errorf("expected the key to be called 'foo', got '%s'", k.Name())
+	}
+
+	if !strings.HasPrefix(k.Path().String(), "/ipns/Qm") {
+		t.Errorf("expected the key to be prefixed with '/ipns/Qm', got '%s'", k.Path().String())
+	}
+}
+
+func TestGenerateSize(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	k, err := api.Key().Generate(ctx, "foo", opt.Key.Size(1024))
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if k.Name() != "foo" {
+		t.Errorf("expected the key to be called 'foo', got '%s'", k.Name())
+	}
+
+	if !strings.HasPrefix(k.Path().String(), "/ipns/Qm") {
+		t.Errorf("expected the key to be prefixed with '/ipns/Qm', got '%s'", k.Path().String())
+	}
+}
+
+func TestGenerateType(t *testing.T) {
+	ctx := context.Background()
+	t.Skip("disabled until libp2p/specs#111 is fixed")
+
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	k, err := api.Key().Generate(ctx, "bar", opt.Key.Type(opt.Ed25519Key))
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if k.Name() != "bar" {
+		t.Errorf("expected the key to be called 'foo', got '%s'", k.Name())
+	}
+
+	// Expected to be an inlined identity hash.
+	if !strings.HasPrefix(k.Path().String(), "/ipns/12") {
+		t.Errorf("expected the key to be prefixed with '/ipns/12', got '%s'", k.Path().String())
+	}
+}
+
+func TestGenerateExisting(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "key with name 'foo' already exists" {
+			t.Fatalf("expected error 'key with name 'foo' already exists', got '%s'", err.Error())
+		}
+	}
+
+	_, err = api.Key().Generate(ctx, "self")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot create key with name 'self'" {
+			t.Fatalf("expected error 'cannot create key with name 'self'', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestList(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	l, err := api.Key().List(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if len(l) != 2 {
+		t.Fatalf("expected to get 2 keys, got %d", len(l))
+		return
+	}
+
+	if l[0].Name() != "self" {
+		t.Fatalf("expected key 0 to be called 'self', got '%s'", l[0].Name())
+		return
+	}
+
+	if l[1].Name() != "foo" {
+		t.Fatalf("expected key 1 to be called 'foo', got '%s'", l[1].Name())
+		return
+	}
+
+	if !strings.HasPrefix(l[0].Path().String(), "/ipns/Qm") {
+		t.Fatalf("expected key 0 to be prefixed with '/ipns/Qm', got '%s'", l[0].Name())
+		return
+	}
+
+	if !strings.HasPrefix(l[1].Path().String(), "/ipns/Qm") {
+		t.Fatalf("expected key 1 to be prefixed with '/ipns/Qm', got '%s'", l[1].Name())
+		return
+	}
+}
+
+func TestRename(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	k, overwrote, err := api.Key().Rename(ctx, "foo", "bar")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if overwrote {
+		t.Error("overwrote should be false")
+	}
+
+	if k.Name() != "bar" {
+		t.Errorf("returned key should be called 'bar', got '%s'", k.Name())
+	}
+}
+
+func TestRenameToSelf(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, _, err = api.Key().Rename(ctx, "foo", "self")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot overwrite key with name 'self'" {
+			t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestRenameToSelfForce(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, _, err = api.Key().Rename(ctx, "foo", "self", opt.Key.Force(true))
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "cannot overwrite key with name 'self'" {
+			t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestRenameOverwriteNoForce(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, err = api.Key().Generate(ctx, "bar")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, _, err = api.Key().Rename(ctx, "foo", "bar")
+	if err == nil {
+		t.Error("expected error to not be nil")
+	} else {
+		if err.Error() != "key by that name already exists, refusing to overwrite" {
+			t.Fatalf("expected error 'key by that name already exists, refusing to overwrite', got '%s'", err.Error())
+		}
+	}
+}
+
+func TestRenameOverwrite(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	kfoo, err := api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	_, err = api.Key().Generate(ctx, "bar")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	k, overwrote, err := api.Key().Rename(ctx, "foo", "bar", opt.Key.Force(true))
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if !overwrote {
+		t.Error("overwrote should be true")
+	}
+
+	if k.Name() != "bar" {
+		t.Errorf("returned key should be called 'bar', got '%s'", k.Name())
+	}
+
+	if k.Path().String() != kfoo.Path().String() {
+		t.Errorf("k and kfoo should have equal paths, '%s'!='%s'", k.Path().String(), kfoo.Path().String())
+	}
+}
+
+func TestRenameSameNameNoForce(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	k, overwrote, err := api.Key().Rename(ctx, "foo", "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if overwrote {
+		t.Error("overwrote should be false")
+	}
+
+	if k.Name() != "foo" {
+		t.Errorf("returned key should be called 'foo', got '%s'", k.Name())
+	}
+}
+
+func TestRenameSameName(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	k, overwrote, err := api.Key().Rename(ctx, "foo", "foo", opt.Key.Force(true))
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if overwrote {
+		t.Error("overwrote should be false")
+	}
+
+	if k.Name() != "foo" {
+		t.Errorf("returned key should be called 'foo', got '%s'", k.Name())
+	}
+}
+
+func TestRemove(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	k, err := api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	l, err := api.Key().List(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if len(l) != 2 {
+		t.Fatalf("expected to get 2 keys, got %d", len(l))
+		return
+	}
+
+	p, err := api.Key().Remove(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if k.Path().String() != p.Path().String() {
+		t.Errorf("k and p should have equal paths, '%s'!='%s'", k.Path().String(), p.Path().String())
+	}
+
+	l, err = api.Key().List(ctx)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	if len(l) != 1 {
+		t.Fatalf("expected to get 1 key, got %d", len(l))
+		return
+	}
+
+	if l[0].Name() != "self" {
+		t.Errorf("expected the key to be called 'self', got '%s'", l[0].Name())
+	}
+}
diff --git a/core/coreiface/tests/name_test.go b/core/coreiface/tests/name_test.go
new file mode 100644
index 000000000..a3514e051
--- /dev/null
+++ b/core/coreiface/tests/name_test.go
@@ -0,0 +1,262 @@
+package tests_test
+
+import (
+	"context"
+	"io"
+	"math/rand"
+	"path"
+	"testing"
+	"time"
+
+	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	ipath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
+
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+var rnd = rand.New(rand.NewSource(0x62796532303137))
+
+func addTestObject(ctx context.Context, api coreiface.CoreAPI) (coreiface.Path, error) {
+	return api.Unixfs().Add(ctx, files.NewReaderFile(&io.LimitedReader{R: rnd, N: 4092}))
+}
+
+func appendPath(p coreiface.Path, sub string) coreiface.Path {
+	p, err := coreiface.ParsePath(path.Join(p.String(), sub))
+	if err != nil {
+		panic(err)
+	}
+	return p
+}
+
+func TestPublishResolve(t *testing.T) {
+	ctx := context.Background()
+	init := func() (coreiface.CoreAPI, coreiface.Path) {
+		apis, err := makeAPISwarm(ctx, true, 5)
+		if err != nil {
+			t.Fatal(err)
+			return nil, nil
+		}
+		api := apis[0]
+
+		p, err := addTestObject(ctx, api)
+		if err != nil {
+			t.Fatal(err)
+			return nil, nil
+		}
+		return api, p
+	}
+
+	run := func(t *testing.T, ropts []opt.NameResolveOption) {
+		t.Run("basic", func(t *testing.T) {
+			api, p := init()
+			e, err := api.Name().Publish(ctx, p)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			self, err := api.Key().Self(ctx)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if e.Name() != self.ID().Pretty() {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			}
+
+			if e.Value().String() != p.String() {
+				t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+			}
+
+			resPath, err := api.Name().Resolve(ctx, e.Name(), ropts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if resPath.String() != p.String() {
+				t.Errorf("expected paths to match, '%s'!='%s'", resPath.String(), p.String())
+			}
+		})
+
+		t.Run("publishPath", func(t *testing.T) {
+			api, p := init()
+			e, err := api.Name().Publish(ctx, appendPath(p, "/test"))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			self, err := api.Key().Self(ctx)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if e.Name() != self.ID().Pretty() {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			}
+
+			if e.Value().String() != p.String()+"/test" {
+				t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+			}
+
+			resPath, err := api.Name().Resolve(ctx, e.Name(), ropts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if resPath.String() != p.String()+"/test" {
+				t.Errorf("expected paths to match, '%s'!='%s'", resPath.String(), p.String()+"/test")
+			}
+		})
+
+		t.Run("revolvePath", func(t *testing.T) {
+			api, p := init()
+			e, err := api.Name().Publish(ctx, p)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			self, err := api.Key().Self(ctx)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if e.Name() != self.ID().Pretty() {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			}
+
+			if e.Value().String() != p.String() {
+				t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+			}
+
+			resPath, err := api.Name().Resolve(ctx, e.Name()+"/test", ropts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if resPath.String() != p.String()+"/test" {
+				t.Errorf("expected paths to match, '%s'!='%s'", resPath.String(), p.String()+"/test")
+			}
+		})
+
+		t.Run("publishRevolvePath", func(t *testing.T) {
+			api, p := init()
+			e, err := api.Name().Publish(ctx, appendPath(p, "/a"))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			self, err := api.Key().Self(ctx)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if e.Name() != self.ID().Pretty() {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			}
+
+			if e.Value().String() != p.String()+"/a" {
+				t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+			}
+
+			resPath, err := api.Name().Resolve(ctx, e.Name()+"/b", ropts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if resPath.String() != p.String()+"/a/b" {
+				t.Errorf("expected paths to match, '%s'!='%s'", resPath.String(), p.String()+"/a/b")
+			}
+		})
+	}
+
+	t.Run("default", func(t *testing.T) {
+		run(t, []opt.NameResolveOption{})
+	})
+
+	t.Run("nocache", func(t *testing.T) {
+		run(t, []opt.NameResolveOption{opt.Name.Cache(false)})
+	})
+}
+
+func TestBasicPublishResolveKey(t *testing.T) {
+	ctx := context.Background()
+	apis, err := makeAPISwarm(ctx, true, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+	api := apis[0]
+
+	k, err := api.Key().Generate(ctx, "foo")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p, err := addTestObject(ctx, api)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	e, err := api.Name().Publish(ctx, p, opt.Name.Key(k.Name()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if ipath.Join([]string{"/ipns", e.Name()}) != k.Path().String() {
+		t.Errorf("expected e.Name to equal '%s', got '%s'", e.Name(), k.Path().String())
+	}
+
+	if e.Value().String() != p.String() {
+		t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+	}
+
+	resPath, err := api.Name().Resolve(ctx, e.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if resPath.String() != p.String() {
+		t.Errorf("expected paths to match, '%s'!='%s'", resPath.String(), p.String())
+	}
+}
+
+func TestBasicPublishResolveTimeout(t *testing.T) {
+	t.Skip("ValidTime doesn't appear to work at this time resolution")
+
+	ctx := context.Background()
+	apis, err := makeAPISwarm(ctx, true, 5)
+	if err != nil {
+		t.Fatal(err)
+	}
+	api := apis[0]
+	p, err := addTestObject(ctx, api)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	e, err := api.Name().Publish(ctx, p, opt.Name.ValidTime(time.Millisecond*100))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	self, err := api.Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if e.Name() != self.ID().Pretty() {
+		t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+	}
+
+	if e.Value().String() != p.String() {
+		t.Errorf("expected paths to match, '%s'!='%s'", e.Value().String(), p.String())
+	}
+
+	time.Sleep(time.Second)
+
+	_, err = api.Name().Resolve(ctx, e.Name())
+	if err == nil {
+		t.Fatal("Expected an error")
+	}
+}
+
+//TODO: When swarm api is created, add multinode tests
diff --git a/core/coreiface/tests/object_test.go b/core/coreiface/tests/object_test.go
new file mode 100644
index 000000000..ac9e1d5f3
--- /dev/null
+++ b/core/coreiface/tests/object_test.go
@@ -0,0 +1,427 @@
+package tests_test
+
+import (
+	"bytes"
+	"context"
+	"encoding/hex"
+	"io/ioutil"
+	"strings"
+	"testing"
+
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+func TestNew(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	emptyNode, err := api.Object().New(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dirNode, err := api.Object().New(ctx, opt.Object.Type("unixfs-dir"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if emptyNode.String() != "QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n" {
+		t.Errorf("Unexpected emptyNode path: %s", emptyNode.String())
+	}
+
+	if dirNode.String() != "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn" {
+		t.Errorf("Unexpected dirNode path: %s", dirNode.String())
+	}
+}
+
+func TestObjectPut(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"YmFy"}`), opt.Object.DataType("base64")) //bar
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pbBytes, err := hex.DecodeString("0a0362617a")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p3, err := api.Object().Put(ctx, bytes.NewReader(pbBytes), opt.Object.InputEnc("protobuf"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if p1.String() != "/ipfs/QmQeGyS87nyijii7kFt1zbe4n2PsXTFimzsdxyE9qh9TST" {
+		t.Errorf("unexpected path: %s", p1.String())
+	}
+
+	if p2.String() != "/ipfs/QmNeYRbCibmaMMK6Du6ChfServcLqFvLJF76PzzF76SPrZ" {
+		t.Errorf("unexpected path: %s", p2.String())
+	}
+
+	if p3.String() != "/ipfs/QmZreR7M2t7bFXAdb1V5FtQhjk4t36GnrvueLJowJbQM9m" {
+		t.Errorf("unexpected path: %s", p3.String())
+	}
+}
+
+func TestObjectGet(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	nd, err := api.Object().Get(ctx, p1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(nd.RawData()[len(nd.RawData())-3:]) != "foo" {
+		t.Fatal("got non-matching data")
+	}
+}
+
+func TestObjectData(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Object().Data(ctx, p1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(data) != "foo" {
+		t.Fatal("got non-matching data")
+	}
+}
+
+func TestObjectLinks(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Links":[{"Name":"bar", "Hash":"`+p1.Cid().String()+`"}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	links, err := api.Object().Links(ctx, p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(links) != 1 {
+		t.Errorf("unexpected number of links: %d", len(links))
+	}
+
+	if links[0].Cid.String() != p1.Cid().String() {
+		t.Fatal("cids didn't batch")
+	}
+
+	if links[0].Name != "bar" {
+		t.Fatal("unexpected link name")
+	}
+}
+
+func TestObjectStat(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"bazz", "Links":[{"Name":"bar", "Hash":"`+p1.Cid().String()+`", "Size":3}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	stat, err := api.Object().Stat(ctx, p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if stat.Cid.String() != p2.Cid().String() {
+		t.Error("unexpected stat.Cid")
+	}
+
+	if stat.NumLinks != 1 {
+		t.Errorf("unexpected stat.NumLinks")
+	}
+
+	if stat.BlockSize != 51 {
+		t.Error("unexpected stat.BlockSize")
+	}
+
+	if stat.LinksSize != 47 {
+		t.Errorf("unexpected stat.LinksSize: %d", stat.LinksSize)
+	}
+
+	if stat.DataSize != 4 {
+		t.Error("unexpected stat.DataSize")
+	}
+
+	if stat.CumulativeSize != 54 {
+		t.Error("unexpected stat.DataSize")
+	}
+}
+
+func TestObjectAddLink(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"bazz", "Links":[{"Name":"bar", "Hash":"`+p1.Cid().String()+`", "Size":3}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p3, err := api.Object().AddLink(ctx, p2, "abc", p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	links, err := api.Object().Links(ctx, p3)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(links) != 2 {
+		t.Errorf("unexpected number of links: %d", len(links))
+	}
+
+	if links[0].Name != "abc" {
+		t.Errorf("unexpected link 0 name: %s", links[0].Name)
+	}
+
+	if links[1].Name != "bar" {
+		t.Errorf("unexpected link 1 name: %s", links[1].Name)
+	}
+}
+
+func TestObjectAddLinkCreate(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"bazz", "Links":[{"Name":"bar", "Hash":"`+p1.Cid().String()+`", "Size":3}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p3, err := api.Object().AddLink(ctx, p2, "abc/d", p2)
+	if err == nil {
+		t.Fatal("expected an error")
+	}
+	if err.Error() != "no link by that name" {
+		t.Fatalf("unexpected error: %s", err.Error())
+	}
+
+	p3, err = api.Object().AddLink(ctx, p2, "abc/d", p2, opt.Object.Create(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	links, err := api.Object().Links(ctx, p3)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(links) != 2 {
+		t.Errorf("unexpected number of links: %d", len(links))
+	}
+
+	if links[0].Name != "abc" {
+		t.Errorf("unexpected link 0 name: %s", links[0].Name)
+	}
+
+	if links[1].Name != "bar" {
+		t.Errorf("unexpected link 1 name: %s", links[1].Name)
+	}
+}
+
+func TestObjectRmLink(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"bazz", "Links":[{"Name":"bar", "Hash":"`+p1.Cid().String()+`", "Size":3}]}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p3, err := api.Object().RmLink(ctx, p2, "bar")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	links, err := api.Object().Links(ctx, p3)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(links) != 0 {
+		t.Errorf("unexpected number of links: %d", len(links))
+	}
+}
+
+func TestObjectAddData(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().AppendData(ctx, p1, strings.NewReader("bar"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Object().Data(ctx, p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data, err := ioutil.ReadAll(r)
+
+	if string(data) != "foobar" {
+		t.Error("unexpected data")
+	}
+}
+
+func TestObjectSetData(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().SetData(ctx, p1, strings.NewReader("bar"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Object().Data(ctx, p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data, err := ioutil.ReadAll(r)
+
+	if string(data) != "bar" {
+		t.Error("unexpected data")
+	}
+}
+
+func TestDiffTest(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"foo"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p2, err := api.Object().Put(ctx, strings.NewReader(`{"Data":"bar"}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	changes, err := api.Object().Diff(ctx, p1, p2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(changes) != 1 {
+		t.Fatal("unexpected changes len")
+	}
+
+	if changes[0].Type != iface.DiffMod {
+		t.Fatal("unexpected change type")
+	}
+
+	if changes[0].Before.String() != p1.String() {
+		t.Fatal("unexpected before path")
+	}
+
+	if changes[0].After.String() != p2.String() {
+		t.Fatal("unexpected before path")
+	}
+}
diff --git a/core/coreiface/tests/path_test.go b/core/coreiface/tests/path_test.go
new file mode 100644
index 000000000..e05428073
--- /dev/null
+++ b/core/coreiface/tests/path_test.go
@@ -0,0 +1,154 @@
+package tests_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+func TestMutablePath(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// get self /ipns path
+	keys, err := api.Key().List(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !keys[0].Path().Mutable() {
+		t.Error("expected self /ipns path to be mutable")
+	}
+
+	blk, err := api.Block().Put(ctx, strings.NewReader(`foo`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if blk.Path().Mutable() {
+		t.Error("expected /ipld path to be immutable")
+	}
+}
+
+func TestPathRemainder(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := coreiface.ParsePath(obj.String() + "/foo/bar")
+	if err != nil {
+		t.Error(err)
+	}
+
+	rp1, err := api.ResolvePath(ctx, p1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if rp1.Remainder() != "foo/bar" {
+		t.Error("expected to get path remainder")
+	}
+}
+
+func TestEmptyPathRemainder(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if obj.Remainder() != "" {
+		t.Error("expected the resolved path to not have a remainder")
+	}
+
+	p1, err := coreiface.ParsePath(obj.String())
+	if err != nil {
+		t.Error(err)
+	}
+
+	rp1, err := api.ResolvePath(ctx, p1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if rp1.Remainder() != "" {
+		t.Error("expected the resolved path to not have a remainder")
+	}
+}
+
+func TestInvalidPathRemainder(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := coreiface.ParsePath(obj.String() + "/bar/baz")
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.ResolvePath(ctx, p1)
+	if err == nil || err.Error() != "no such link found" {
+		t.Fatalf("unexpected error: %s", err)
+	}
+}
+
+func TestPathRoot(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	blk, err := api.Block().Put(ctx, strings.NewReader(`foo`), options.Block.Format("raw"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p1, err := coreiface.ParsePath(obj.String() + "/foo")
+	if err != nil {
+		t.Error(err)
+	}
+
+	rp, err := api.ResolvePath(ctx, p1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if rp.Root().String() != obj.Cid().String() {
+		t.Error("unexpected path root")
+	}
+
+	if rp.Cid().String() != blk.Path().Cid().String() {
+		t.Error("unexpected path cid")
+	}
+}
diff --git a/core/coreiface/tests/pin_test.go b/core/coreiface/tests/pin_test.go
new file mode 100644
index 000000000..5c4b82bc2
--- /dev/null
+++ b/core/coreiface/tests/pin_test.go
@@ -0,0 +1,214 @@
+package tests_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+)
+
+func TestPinAdd(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	p, err := api.Unixfs().Add(ctx, strFile("foo")())
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Pin().Add(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestPinSimple(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	p, err := api.Unixfs().Add(ctx, strFile("foo")())
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Pin().Add(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+
+	list, err := api.Pin().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 1 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+
+	if list[0].Path().Cid().String() != p.Cid().String() {
+		t.Error("paths don't match")
+	}
+
+	if list[0].Type() != "recursive" {
+		t.Error("unexpected pin type")
+	}
+
+	err = api.Pin().Rm(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	list, err = api.Pin().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 0 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+}
+
+func TestPinRecursive(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	p0, err := api.Unixfs().Add(ctx, strFile("foo")())
+	if err != nil {
+		t.Error(err)
+	}
+
+	p1, err := api.Unixfs().Add(ctx, strFile("bar")())
+	if err != nil {
+		t.Error(err)
+	}
+
+	p2, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	p3, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`))
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Pin().Add(ctx, p2)
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Pin().Add(ctx, p3, opt.Pin.Recursive(false))
+	if err != nil {
+		t.Error(err)
+	}
+
+	list, err := api.Pin().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 3 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+
+	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Direct())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 1 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+
+	if list[0].Path().String() != p3.String() {
+		t.Error("unexpected path")
+	}
+
+	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 1 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+
+	if list[0].Path().String() != p2.String() {
+		t.Error("unexpected path")
+	}
+
+	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(list) != 1 {
+		t.Errorf("unexpected pin list len: %d", len(list))
+	}
+
+	if list[0].Path().Cid().String() != p0.Cid().String() {
+		t.Error("unexpected path")
+	}
+
+	res, err := api.Pin().Verify(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	n := 0
+	for r := range res {
+		if !r.Ok() {
+			t.Error("expected pin to be ok")
+		}
+		n++
+	}
+
+	if n != 1 {
+		t.Errorf("unexpected verify result count: %d", n)
+	}
+
+	//TODO: figure out a way to test verify without touching IpfsNode
+	/*
+		err = api.Block().Rm(ctx, p0, opt.Block.Force(true))
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		res, err = api.Pin().Verify(ctx)
+		if err != nil {
+			t.Fatal(err)
+		}
+		n = 0
+		for r := range res {
+			if r.Ok() {
+				t.Error("expected pin to not be ok")
+			}
+
+			if len(r.BadNodes()) != 1 {
+				t.Fatalf("unexpected badNodes len")
+			}
+
+			if r.BadNodes()[0].Path().Cid().String() != p0.Cid().String() {
+				t.Error("unexpected badNode path")
+			}
+
+			if r.BadNodes()[0].Err().Error() != "merkledag: not found" {
+				t.Errorf("unexpected badNode error: %s", r.BadNodes()[0].Err().Error())
+			}
+			n++
+		}
+
+		if n != 1 {
+			t.Errorf("unexpected verify result count: %d", n)
+		}
+	*/
+}
diff --git a/core/coreiface/tests/pubsub_test.go b/core/coreiface/tests/pubsub_test.go
new file mode 100644
index 000000000..19a1eba52
--- /dev/null
+++ b/core/coreiface/tests/pubsub_test.go
@@ -0,0 +1,106 @@
+package tests_test
+
+import (
+	"context"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"testing"
+	"time"
+)
+
+func TestBasicPubSub(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	apis, err := makeAPISwarm(ctx, true, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sub, err := apis[0].PubSub().Subscribe(ctx, "testch")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	go func() {
+		tick := time.Tick(100 * time.Millisecond)
+
+		for {
+			err = apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
+			if err != nil {
+				t.Fatal(err)
+			}
+			select {
+			case <-tick:
+			case <-ctx.Done():
+				return
+			}
+		}
+	}()
+
+	m, err := sub.Next(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(m.Data()) != "hello world" {
+		t.Errorf("got invalid data: %s", string(m.Data()))
+	}
+
+	self1, err := apis[1].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if m.From() != self1.ID() {
+		t.Errorf("m.From didn't match")
+	}
+
+	peers, err := apis[1].PubSub().Peers(ctx, options.PubSub.Topic("testch"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(peers) != 1 {
+		t.Fatalf("got incorrect number of peers: %d", len(peers))
+	}
+
+	self0, err := apis[0].Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if peers[0] != self0.ID() {
+		t.Errorf("peer didn't match")
+	}
+
+	peers, err = apis[1].PubSub().Peers(ctx, options.PubSub.Topic("nottestch"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(peers) != 0 {
+		t.Fatalf("got incorrect number of peers: %d", len(peers))
+	}
+
+	topics, err := apis[0].PubSub().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(topics) != 1 {
+		t.Fatalf("got incorrect number of topics: %d", len(peers))
+	}
+
+	if topics[0] != "testch" {
+		t.Errorf("topic didn't match")
+	}
+
+	topics, err = apis[1].PubSub().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(topics) != 0 {
+		t.Fatalf("got incorrect number of topics: %d", len(peers))
+	}
+}
diff --git a/core/coreiface/tests/unixfs_test.go b/core/coreiface/tests/unixfs_test.go
new file mode 100644
index 000000000..d7ddae963
--- /dev/null
+++ b/core/coreiface/tests/unixfs_test.go
@@ -0,0 +1,963 @@
+package tests_test
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"fmt"
+	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	"io"
+	"io/ioutil"
+	"math"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"testing"
+
+	"github.com/ipfs/go-ipfs/core"
+	"github.com/ipfs/go-ipfs/core/coreapi"
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	mock "github.com/ipfs/go-ipfs/core/mock"
+	"github.com/ipfs/go-ipfs/keystore"
+	"github.com/ipfs/go-ipfs/repo"
+
+	ci "gx/ipfs/QmNiJiXwWE3kRhZrC5ej3kSjWHm337pYfhjLGSCDNKJP2s/go-libp2p-crypto"
+	"gx/ipfs/QmRBaUEQEeFWywfrZJ64QgsmvcqgLSK3VbvGMR2NM2Edpf/go-libp2p/p2p/net/mock"
+	cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
+	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
+	"gx/ipfs/Qmbvw7kpSM2p6rbQ57WGRhhqNfCiNGW6EKH4xgHLw4bsnB/go-unixfs"
+	"gx/ipfs/QmcZfkbgwwwH5ZLTQRHkSQBDiDqd3skY2eU6MZRgWuXcse/go-ipfs-config"
+	mdag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
+	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	"gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore"
+	syncds "gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore/sync"
+)
+
+const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
+
+// `echo -n 'hello, world!' | ipfs add`
+var hello = "/ipfs/QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk"
+var helloStr = "hello, world!"
+
+// `echo -n | ipfs add`
+var emptyFile = "/ipfs/QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH"
+
+func makeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
+	mn := mocknet.New(ctx)
+
+	nodes := make([]*core.IpfsNode, n)
+	apis := make([]coreiface.CoreAPI, n)
+
+	for i := 0; i < n; i++ {
+		var ident config.Identity
+		if fullIdentity {
+			sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
+			if err != nil {
+				return nil, err
+			}
+
+			id, err := peer.IDFromPublicKey(pk)
+			if err != nil {
+				return nil, err
+			}
+
+			kbytes, err := sk.Bytes()
+			if err != nil {
+				return nil, err
+			}
+
+			ident = config.Identity{
+				PeerID:  id.Pretty(),
+				PrivKey: base64.StdEncoding.EncodeToString(kbytes),
+			}
+		} else {
+			ident = config.Identity{
+				PeerID: testPeerID,
+			}
+		}
+
+		c := config.Config{}
+		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
+		c.Identity = ident
+
+		r := &repo.Mock{
+			C: c,
+			D: syncds.MutexWrap(datastore.NewMapDatastore()),
+			K: keystore.NewMemKeystore(),
+		}
+
+		node, err := core.NewNode(ctx, &core.BuildCfg{
+			Repo:   r,
+			Host:   mock.MockHostOption(mn),
+			Online: fullIdentity,
+			ExtraOpts: map[string]bool{
+				"pubsub": true,
+			},
+		})
+		if err != nil {
+			return nil, err
+		}
+		nodes[i] = node
+		apis[i], err = coreapi.NewCoreAPI(node)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err := mn.LinkAll()
+	if err != nil {
+		return nil, err
+	}
+
+	bsinf := core.BootstrapConfigWithPeers(
+		[]pstore.PeerInfo{
+			nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
+		},
+	)
+
+	for _, n := range nodes[1:] {
+		if err := n.Bootstrap(bsinf); err != nil {
+			return nil, err
+		}
+	}
+
+	return apis, nil
+}
+
+func makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
+	api, err := makeAPISwarm(ctx, false, 1)
+	if err != nil {
+		return nil, err
+	}
+
+	return api[0], nil
+}
+
+func strFile(data string) func() files.Node {
+	return func() files.Node {
+		return files.NewBytesFile([]byte(data))
+	}
+}
+
+func twoLevelDir() func() files.Node {
+	return func() files.Node {
+		return files.NewMapDirectory(map[string]files.Node{
+			"abc": files.NewMapDirectory(map[string]files.Node{
+				"def": files.NewBytesFile([]byte("world")),
+			}),
+
+			"bar": files.NewBytesFile([]byte("hello2")),
+			"foo": files.NewBytesFile([]byte("hello1")),
+		})
+	}
+}
+
+func flatDir() files.Node {
+	return files.NewMapDirectory(map[string]files.Node{
+		"bar": files.NewBytesFile([]byte("hello2")),
+		"foo": files.NewBytesFile([]byte("hello1")),
+	})
+}
+
+func wrapped(name string) func(f files.Node) files.Node {
+	return func(f files.Node) files.Node {
+		return files.NewMapDirectory(map[string]files.Node{
+			name: f,
+		})
+	}
+}
+
+func TestAdd(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	p := func(h string) coreiface.ResolvedPath {
+		c, err := cid.Parse(h)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return coreiface.IpfsPath(c)
+	}
+
+	cases := []struct {
+		name   string
+		data   func() files.Node
+		expect func(files.Node) files.Node
+
+		apiOpts []options.ApiOption
+
+		path string
+		err  string
+
+		wrap string
+
+		events []coreiface.AddEvent
+
+		opts []options.UnixfsAddOption
+	}{
+		// Simple cases
+		{
+			name: "simpleAdd",
+			data: strFile(helloStr),
+			path: hello,
+			opts: []options.UnixfsAddOption{},
+		},
+		{
+			name: "addEmpty",
+			data: strFile(""),
+			path: emptyFile,
+		},
+		// CIDv1 version / rawLeaves
+		{
+			name: "addCidV1",
+			data: strFile(helloStr),
+			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1)},
+		},
+		{
+			name: "addCidV1NoLeaves",
+			data: strFile(helloStr),
+			path: "/ipfs/zdj7WY4GbN8NDbTW1dfCShAQNVovams2xhq9hVCx5vXcjvT8g",
+			opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1), options.Unixfs.RawLeaves(false)},
+		},
+		// Non sha256 hash vs CID
+		{
+			name: "addCidSha3",
+			data: strFile(helloStr),
+			path: "/ipfs/zb2wwnYtXBxpndNABjtYxWAPt3cwWNRnc11iT63fvkYV78iRb",
+			opts: []options.UnixfsAddOption{options.Unixfs.Hash(mh.SHA3_256)},
+		},
+		{
+			name: "addCidSha3Cid0",
+			data: strFile(helloStr),
+			err:  "CIDv0 only supports sha2-256",
+			opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(0), options.Unixfs.Hash(mh.SHA3_256)},
+		},
+		// Inline
+		{
+			name: "addInline",
+			data: strFile(helloStr),
+			path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
+			opts: []options.UnixfsAddOption{options.Unixfs.Inline(true)},
+		},
+		{
+			name: "addInlineLimit",
+			data: strFile(helloStr),
+			path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
+			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true)},
+		},
+		{
+			name: "addInlineZero",
+			data: strFile(""),
+			path: "/ipfs/z2yYDV",
+			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(0), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
+		},
+		{ //TODO: after coreapi add is used in `ipfs add`, consider making this default for inline
+			name: "addInlineRaw",
+			data: strFile(helloStr),
+			path: "/ipfs/zj7Gr8AcBreqGEfrnR5kPFe",
+			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
+		},
+		// Chunker / Layout
+		{
+			name: "addChunks",
+			data: strFile(strings.Repeat("aoeuidhtns", 200)),
+			path: "/ipfs/QmRo11d4QJrST47aaiGVJYwPhoNA4ihRpJ5WaxBWjWDwbX",
+			opts: []options.UnixfsAddOption{options.Unixfs.Chunker("size-4")},
+		},
+		{
+			name: "addChunksTrickle",
+			data: strFile(strings.Repeat("aoeuidhtns", 200)),
+			path: "/ipfs/QmNNhDGttafX3M1wKWixGre6PrLFGjnoPEDXjBYpTv93HP",
+			opts: []options.UnixfsAddOption{options.Unixfs.Chunker("size-4"), options.Unixfs.Layout(options.TrickleLayout)},
+		},
+		// Local
+		{
+			name:    "addLocal", // better cases in sharness
+			data:    strFile(helloStr),
+			path:    hello,
+			apiOpts: []options.ApiOption{options.Api.Offline(true)},
+		},
+		{
+			name: "hashOnly", // test (non)fetchability
+			data: strFile(helloStr),
+			path: hello,
+			opts: []options.UnixfsAddOption{options.Unixfs.HashOnly(true)},
+		},
+		// multi file
+		{
+			name: "simpleDir",
+			data: flatDir,
+			wrap: "t",
+			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
+		},
+		{
+			name: "twoLevelDir",
+			data: twoLevelDir(),
+			wrap: "t",
+			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
+		},
+		// wrapped
+		{
+			name: "addWrapped",
+			path: "/ipfs/QmVE9rNpj5doj7XHzp5zMUxD7BJgXEqx4pe3xZ3JBReWHE",
+			data: func() files.Node {
+				return files.NewBytesFile([]byte(helloStr))
+			},
+			wrap:   "foo",
+			expect: wrapped("foo"),
+			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
+		},
+		{
+			name: "addNotWrappedDirFile",
+			path: hello,
+			data: func() files.Node {
+				return files.NewBytesFile([]byte(helloStr))
+			},
+			wrap: "foo",
+		},
+		{
+			name: "stdinWrapped",
+			path: "/ipfs/QmU3r81oZycjHS9oaSHw37ootMFuFUw1DvMLKXPsezdtqU",
+			data: func() files.Node {
+				return files.NewBytesFile([]byte(helloStr))
+			},
+			expect: func(files.Node) files.Node {
+				return files.NewMapDirectory(map[string]files.Node{
+					"QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk": files.NewBytesFile([]byte(helloStr)),
+				})
+			},
+			opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
+		},
+		{
+			name: "stdinNamed",
+			path: "/ipfs/QmQ6cGBmb3ZbdrQW1MRm1RJnYnaxCqfssz7CrTa9NEhQyS",
+			data: func() files.Node {
+				rf, err := files.NewReaderPathFile(os.Stdin.Name(), ioutil.NopCloser(strings.NewReader(helloStr)), nil)
+				if err != nil {
+					panic(err)
+				}
+
+				return rf
+			},
+			expect: func(files.Node) files.Node {
+				return files.NewMapDirectory(map[string]files.Node{
+					"test": files.NewBytesFile([]byte(helloStr)),
+				})
+			},
+			opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.StdinName("test")},
+		},
+		{
+			name:   "twoLevelDirWrapped",
+			data:   twoLevelDir(),
+			wrap:   "t",
+			expect: wrapped("t"),
+			path:   "/ipfs/QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg",
+			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
+		},
+		{
+			name:   "twoLevelInlineHash",
+			data:   twoLevelDir(),
+			wrap:   "t",
+			expect: wrapped("t"),
+			path:   "/ipfs/zBunoruKoyCHKkALNSWxDvj4L7yuQnMgQ4hUa9j1Z64tVcDEcu6Zdetyu7eeFCxMPfxb7YJvHeFHoFoHMkBUQf6vfdhmi",
+			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true), options.Unixfs.Hash(mh.SHA3)},
+		},
+		// hidden
+		{
+			name: "hiddenFiles",
+			data: func() files.Node {
+				return files.NewMapDirectory(map[string]files.Node{
+					".bar": files.NewBytesFile([]byte("hello2")),
+					"bar":  files.NewBytesFile([]byte("hello2")),
+					"foo":  files.NewBytesFile([]byte("hello1")),
+				})
+			},
+			wrap: "t",
+			path: "/ipfs/QmehGvpf2hY196MzDFmjL8Wy27S4jbgGDUAhBJyvXAwr3g",
+			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(true)},
+		},
+		{
+			name: "hiddenFileAlwaysAdded",
+			data: func() files.Node {
+				return files.NewBytesFile([]byte(helloStr))
+			},
+			wrap: ".foo",
+			path: hello,
+		},
+		{
+			name: "hiddenFilesNotAdded",
+			data: func() files.Node {
+				return files.NewMapDirectory(map[string]files.Node{
+					".bar": files.NewBytesFile([]byte("hello2")),
+					"bar":  files.NewBytesFile([]byte("hello2")),
+					"foo":  files.NewBytesFile([]byte("hello1")),
+				})
+			},
+			expect: func(files.Node) files.Node {
+				return flatDir()
+			},
+			wrap: "t",
+			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
+			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
+		},
+		// Events / Progress
+		{
+			name: "simpleAddEvent",
+			data: strFile(helloStr),
+			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			events: []coreiface.AddEvent{
+				{Name: "zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd", Path: p("zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd"), Size: strconv.Itoa(len(helloStr))},
+			},
+			opts: []options.UnixfsAddOption{options.Unixfs.RawLeaves(true)},
+		},
+		{
+			name: "silentAddEvent",
+			data: twoLevelDir(),
+			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
+			events: []coreiface.AddEvent{
+				{Name: "t/abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
+				{Name: "t", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
+			},
+			wrap: "t",
+			opts: []options.UnixfsAddOption{options.Unixfs.Silent(true)},
+		},
+		{
+			name: "dirAddEvents",
+			data: twoLevelDir(),
+			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
+			events: []coreiface.AddEvent{
+				{Name: "t/abc/def", Path: p("QmNyJpQkU1cEkBwMDhDNFstr42q55mqG5GE5Mgwug4xyGk"), Size: "13"},
+				{Name: "t/bar", Path: p("QmS21GuXiRMvJKHos4ZkEmQDmRBqRaF5tQS2CQCu2ne9sY"), Size: "14"},
+				{Name: "t/foo", Path: p("QmfAjGiVpTN56TXi6SBQtstit5BEw3sijKj1Qkxn6EXKzJ"), Size: "14"},
+				{Name: "t/abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
+				{Name: "t", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
+			},
+			wrap: "t",
+		},
+		{
+			name: "progress1M",
+			data: func() files.Node {
+				return files.NewReaderFile(bytes.NewReader(bytes.Repeat([]byte{0}, 1000000)))
+			},
+			path: "/ipfs/QmXXNNbwe4zzpdMg62ZXvnX1oU7MwSrQ3vAEtuwFKCm1oD",
+			events: []coreiface.AddEvent{
+				{Name: "", Bytes: 262144},
+				{Name: "", Bytes: 524288},
+				{Name: "", Bytes: 786432},
+				{Name: "", Bytes: 1000000},
+				{Name: "QmXXNNbwe4zzpdMg62ZXvnX1oU7MwSrQ3vAEtuwFKCm1oD", Path: p("QmXXNNbwe4zzpdMg62ZXvnX1oU7MwSrQ3vAEtuwFKCm1oD"), Size: "1000256"},
+			},
+			wrap: "",
+			opts: []options.UnixfsAddOption{options.Unixfs.Progress(true)},
+		},
+	}
+
+	for _, testCase := range cases {
+		t.Run(testCase.name, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(ctx)
+			defer cancel()
+
+			// recursive logic
+
+			data := testCase.data()
+			if testCase.wrap != "" {
+				data = files.NewMapDirectory(map[string]files.Node{
+					testCase.wrap: data,
+				})
+			}
+
+			// handle events if relevant to test case
+
+			opts := testCase.opts
+			eventOut := make(chan interface{})
+			var evtWg sync.WaitGroup
+			if len(testCase.events) > 0 {
+				opts = append(opts, options.Unixfs.Events(eventOut))
+				evtWg.Add(1)
+
+				go func() {
+					defer evtWg.Done()
+					expected := testCase.events
+
+					for evt := range eventOut {
+						event, ok := evt.(*coreiface.AddEvent)
+						if !ok {
+							t.Fatal("unexpected event type")
+						}
+
+						if len(expected) < 1 {
+							t.Fatal("got more events than expected")
+						}
+
+						if expected[0].Size != event.Size {
+							t.Errorf("Event.Size didn't match, %s != %s", expected[0].Size, event.Size)
+						}
+
+						if expected[0].Name != event.Name {
+							t.Errorf("Event.Name didn't match, %s != %s", expected[0].Name, event.Name)
+						}
+
+						if expected[0].Path != nil && event.Path != nil {
+							if expected[0].Path.Cid().String() != event.Path.Cid().String() {
+								t.Errorf("Event.Hash didn't match, %s != %s", expected[0].Path, event.Path)
+							}
+						} else if event.Path != expected[0].Path {
+							t.Errorf("Event.Hash didn't match, %s != %s", expected[0].Path, event.Path)
+						}
+						if expected[0].Bytes != event.Bytes {
+							t.Errorf("Event.Bytes didn't match, %d != %d", expected[0].Bytes, event.Bytes)
+						}
+
+						expected = expected[1:]
+					}
+
+					if len(expected) > 0 {
+						t.Fatalf("%d event(s) didn't arrive", len(expected))
+					}
+				}()
+			}
+
+			tapi, err := api.WithOptions(testCase.apiOpts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			// Add!
+
+			p, err := tapi.Unixfs().Add(ctx, data, opts...)
+			close(eventOut)
+			evtWg.Wait()
+			if testCase.err != "" {
+				if err == nil {
+					t.Fatalf("expected an error: %s", testCase.err)
+				}
+				if err.Error() != testCase.err {
+					t.Fatalf("expected an error: '%s' != '%s'", err.Error(), testCase.err)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if p.String() != testCase.path {
+				t.Errorf("expected path %s, got: %s", testCase.path, p)
+			}
+
+			// compare file structure with Unixfs().Get
+
+			var cmpFile func(origName string, orig files.Node, gotName string, got files.Node)
+			cmpFile = func(origName string, orig files.Node, gotName string, got files.Node) {
+				_, origDir := orig.(files.Directory)
+				_, gotDir := got.(files.Directory)
+
+				if origDir != gotDir {
+					t.Fatal("file type mismatch")
+				}
+
+				if origName != gotName {
+					t.Errorf("file name mismatch, orig='%s', got='%s'", origName, gotName)
+				}
+
+				if !gotDir {
+					defer orig.Close()
+					defer got.Close()
+
+					do, err := ioutil.ReadAll(orig.(files.File))
+					if err != nil {
+						t.Fatal(err)
+					}
+
+					dg, err := ioutil.ReadAll(got.(files.File))
+					if err != nil {
+						t.Fatal(err)
+					}
+
+					if !bytes.Equal(do, dg) {
+						t.Fatal("data not equal")
+					}
+
+					return
+				}
+
+				origIt := orig.(files.Directory).Entries()
+				gotIt := got.(files.Directory).Entries()
+
+				for {
+					if origIt.Next() {
+						if !gotIt.Next() {
+							t.Fatal("gotIt out of entries before origIt")
+						}
+					} else {
+						if gotIt.Next() {
+							t.Fatal("origIt out of entries before gotIt")
+						}
+						break
+					}
+
+					cmpFile(origIt.Name(), origIt.Node(), gotIt.Name(), gotIt.Node())
+				}
+				if origIt.Err() != nil {
+					t.Fatal(origIt.Err())
+				}
+				if gotIt.Err() != nil {
+					t.Fatal(gotIt.Err())
+				}
+			}
+
+			f, err := tapi.Unixfs().Get(ctx, p)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			orig := testCase.data()
+			if testCase.expect != nil {
+				orig = testCase.expect(orig)
+			}
+
+			cmpFile("", orig, "", f)
+		})
+	}
+}
+
+func TestAddPinned(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Unixfs().Add(ctx, strFile(helloStr)(), options.Unixfs.Pin(true))
+	if err != nil {
+		t.Error(err)
+	}
+
+	pins, err := api.Pin().Ls(ctx)
+	if len(pins) != 1 {
+		t.Fatalf("expected 1 pin, got %d", len(pins))
+	}
+
+	if pins[0].Path().String() != "/ipld/QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk" {
+		t.Fatalf("got unexpected pin: %s", pins[0].Path().String())
+	}
+}
+
+func TestAddHashOnly(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	p, err := api.Unixfs().Add(ctx, strFile(helloStr)(), options.Unixfs.HashOnly(true))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if p.String() != hello {
+		t.Errorf("unxepected path: %s", p.String())
+	}
+
+	_, err = api.Block().Get(ctx, p)
+	if err == nil {
+		t.Fatal("expected an error")
+	}
+	if err.Error() != "blockservice: key not found" {
+		t.Errorf("unxepected error: %s", err.Error())
+	}
+}
+
+func TestGetEmptyFile(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = api.Unixfs().Add(ctx, files.NewBytesFile([]byte{}))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	emptyFilePath, err := coreiface.ParsePath(emptyFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Unixfs().Get(ctx, emptyFilePath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	buf := make([]byte, 1) // non-zero so that Read() actually tries to read
+	n, err := io.ReadFull(r.(files.File), buf)
+	if err != nil && err != io.EOF {
+		t.Error(err)
+	}
+	if !bytes.HasPrefix(buf, []byte{0x00}) {
+		t.Fatalf("expected empty data, got [%s] [read=%d]", buf, n)
+	}
+}
+
+func TestGetDir(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+	edir := unixfs.EmptyDirNode()
+	_, err = api.Dag().Put(ctx, bytes.NewReader(edir.RawData()), options.Dag.Codec(cid.DagProtobuf), options.Dag.InputEnc("raw"))
+	if err != nil {
+		t.Error(err)
+	}
+	p := coreiface.IpfsPath(edir.Cid())
+
+	emptyDir, err := api.Object().New(ctx, options.Object.Type("unixfs-dir"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if p.String() != coreiface.IpfsPath(emptyDir.Cid()).String() {
+		t.Fatalf("expected path %s, got: %s", emptyDir.Cid(), p.String())
+	}
+
+	r, err := api.Unixfs().Get(ctx, coreiface.IpfsPath(emptyDir.Cid()))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if _, ok := r.(files.Directory); !ok {
+		t.Fatalf("expected a directory")
+	}
+}
+
+func TestGetNonUnixfs(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	nd := new(mdag.ProtoNode)
+	_, err = api.Dag().Put(ctx, bytes.NewReader(nd.RawData()), options.Dag.Codec(nd.CidBuilder().GetCodec()), options.Dag.InputEnc("raw"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Unixfs().Get(ctx, coreiface.IpfsPath(nd.Cid()))
+	if !strings.Contains(err.Error(), "proto: required field") {
+		t.Fatalf("expected protobuf error, got: %s", err)
+	}
+}
+
+func TestLs(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	r := strings.NewReader("content-of-file")
+	p, err := api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{
+		"0": files.NewMapDirectory(map[string]files.Node{
+			"name-of-file": files.NewReaderFile(r),
+		}),
+	}))
+	if err != nil {
+		t.Error(err)
+	}
+
+	links, err := api.Unixfs().Ls(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(links) != 1 {
+		t.Fatalf("expected 1 link, got %d", len(links))
+	}
+	if links[0].Size != 23 {
+		t.Fatalf("expected size = 23, got %d", links[0].Size)
+	}
+	if links[0].Name != "name-of-file" {
+		t.Fatalf("expected name = name-of-file, got %s", links[0].Name)
+	}
+	if links[0].Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
+		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", links[0].Cid)
+	}
+}
+
+func TestEntriesExpired(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	r := strings.NewReader("content-of-file")
+	p, err := api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{
+		"0": files.NewMapDirectory(map[string]files.Node{
+			"name-of-file": files.NewReaderFile(r),
+		}),
+	}))
+	if err != nil {
+		t.Error(err)
+	}
+
+	ctx, cancel := context.WithCancel(ctx)
+
+	nd, err := api.Unixfs().Get(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+	cancel()
+
+	it := files.ToDir(nd).Entries()
+	if it == nil {
+		t.Fatal("it was nil")
+	}
+
+	if it.Next() {
+		t.Fatal("Next succeeded")
+	}
+
+	if it.Err() != context.Canceled {
+		t.Fatalf("unexpected error %s", it.Err())
+	}
+
+	if it.Next() {
+		t.Fatal("Next succeeded")
+	}
+}
+
+func TestLsEmptyDir(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{"0": files.NewSliceDirectory([]files.DirEntry{})}))
+	if err != nil {
+		t.Error(err)
+	}
+
+	emptyDir, err := api.Object().New(ctx, options.Object.Type("unixfs-dir"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(emptyDir.Cid()))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(links) != 0 {
+		t.Fatalf("expected 0 links, got %d", len(links))
+	}
+}
+
+// TODO(lgierth) this should test properly, with len(links) > 0
+func TestLsNonUnixfs(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	nd, err := cbor.WrapObject(map[string]interface{}{"foo": "bar"}, math.MaxUint64, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = api.Dag().Put(ctx, bytes.NewReader(nd.RawData()), options.Dag.Codec(cid.DagCBOR), options.Dag.InputEnc("raw"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(nd.Cid()))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(links) != 0 {
+		t.Fatalf("expected 0 links, got %d", len(links))
+	}
+}
+
+type closeTestF struct {
+	files.File
+	closed bool
+
+	t *testing.T
+}
+
+type closeTestD struct {
+	files.Directory
+	closed bool
+
+	t *testing.T
+}
+
+func (f *closeTestD) Close() error {
+	if f.closed {
+		f.t.Fatal("already closed")
+	}
+	f.closed = true
+	return nil
+}
+
+func (f *closeTestF) Close() error {
+	if f.closed {
+		f.t.Fatal("already closed")
+	}
+	f.closed = true
+	return nil
+}
+
+func TestAddCloses(t *testing.T) {
+	ctx := context.Background()
+	api, err := makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	n4 := &closeTestF{files.NewBytesFile([]byte("foo")), false, t}
+	d3 := &closeTestD{files.NewMapDirectory(map[string]files.Node{
+		"sub": n4,
+	}), false, t}
+	n2 := &closeTestF{files.NewBytesFile([]byte("bar")), false, t}
+	n1 := &closeTestF{files.NewBytesFile([]byte("baz")), false, t}
+	d0 := &closeTestD{files.NewMapDirectory(map[string]files.Node{
+		"a": d3,
+		"b": n1,
+		"c": n2,
+	}), false, t}
+
+	_, err = api.Unixfs().Add(ctx, d0)
+	if err != nil {
+		t.Error(err)
+	}
+
+	d0.Close() // Adder doesn't close top-level file
+
+	for i, n := range []*closeTestF{n1, n2, n4} {
+		if !n.closed {
+			t.Errorf("file %d not closed!", i)
+		}
+	}
+
+	for i, n := range []*closeTestD{d0, d3} {
+		if !n.closed {
+			t.Errorf("dir %d not closed!", i)
+		}
+	}
+
+}

From 373e313822941476f1b96535cab7e822254cad50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Dec 2018 20:11:37 +0100
Subject: [PATCH 158/247] coreapi: run tests from interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@88e58e6b286d55882958c68525d69c4a3dd213b8

This commit was moved from ipfs/boxo@6649a031fab719883b2f507b4191538d61d183bb
---
 core/coreiface/tests/api.go                   | 129 ++++++++++++++++++
 .../tests/{block_test.go => block.go}         |  11 +-
 core/coreiface/tests/{dag_test.go => dag.go}  |  12 +-
 core/coreiface/tests/{dht_test.go => dht.go}  |   8 +-
 core/coreiface/tests/{key_test.go => key.go}  |  19 ++-
 .../coreiface/tests/{name_test.go => name.go} |   7 +-
 .../tests/{object_test.go => object.go}       |  17 ++-
 .../coreiface/tests/{path_test.go => path.go} |  10 +-
 core/coreiface/tests/{pin_test.go => pin.go}  |   8 +-
 .../tests/{pubsub_test.go => pubsub.go}       |   6 +-
 .../tests/{unixfs_test.go => unixfs.go}       | 123 +++--------------
 11 files changed, 233 insertions(+), 117 deletions(-)
 create mode 100644 core/coreiface/tests/api.go
 rename core/coreiface/tests/{block_test.go => block.go} (92%)
 rename core/coreiface/tests/{dag_test.go => dag.go} (92%)
 rename core/coreiface/tests/{dht_test.go => dht.go} (93%)
 rename core/coreiface/tests/{key_test.go => key.go} (93%)
 rename core/coreiface/tests/{name_test.go => name.go} (97%)
 rename core/coreiface/tests/{object_test.go => object.go} (93%)
 rename core/coreiface/tests/{path_test.go => path.go} (91%)
 rename core/coreiface/tests/{pin_test.go => pin.go} (95%)
 rename core/coreiface/tests/{pubsub_test.go => pubsub.go} (95%)
 rename core/coreiface/tests/{unixfs_test.go => unixfs.go} (89%)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
new file mode 100644
index 000000000..8baa869dd
--- /dev/null
+++ b/core/coreiface/tests/api.go
@@ -0,0 +1,129 @@
+package tests
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"testing"
+
+	"github.com/ipfs/go-ipfs/core"
+	"github.com/ipfs/go-ipfs/core/coreapi"
+	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	mock "github.com/ipfs/go-ipfs/core/mock"
+	"github.com/ipfs/go-ipfs/keystore"
+	"github.com/ipfs/go-ipfs/repo"
+
+	ci "gx/ipfs/QmNiJiXwWE3kRhZrC5ej3kSjWHm337pYfhjLGSCDNKJP2s/go-libp2p-crypto"
+	"gx/ipfs/QmRBaUEQEeFWywfrZJ64QgsmvcqgLSK3VbvGMR2NM2Edpf/go-libp2p/p2p/net/mock"
+	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
+	"gx/ipfs/QmcZfkbgwwwH5ZLTQRHkSQBDiDqd3skY2eU6MZRgWuXcse/go-ipfs-config"
+	"gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore"
+	syncds "gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore/sync"
+)
+
+
+func makeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
+	mn := mocknet.New(ctx)
+
+	nodes := make([]*core.IpfsNode, n)
+	apis := make([]coreiface.CoreAPI, n)
+
+	for i := 0; i < n; i++ {
+		var ident config.Identity
+		if fullIdentity {
+			sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
+			if err != nil {
+				return nil, err
+			}
+
+			id, err := peer.IDFromPublicKey(pk)
+			if err != nil {
+				return nil, err
+			}
+
+			kbytes, err := sk.Bytes()
+			if err != nil {
+				return nil, err
+			}
+
+			ident = config.Identity{
+				PeerID:  id.Pretty(),
+				PrivKey: base64.StdEncoding.EncodeToString(kbytes),
+			}
+		} else {
+			ident = config.Identity{
+				PeerID: testPeerID,
+			}
+		}
+
+		c := config.Config{}
+		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
+		c.Identity = ident
+
+		r := &repo.Mock{
+			C: c,
+			D: syncds.MutexWrap(datastore.NewMapDatastore()),
+			K: keystore.NewMemKeystore(),
+		}
+
+		node, err := core.NewNode(ctx, &core.BuildCfg{
+			Repo:   r,
+			Host:   mock.MockHostOption(mn),
+			Online: fullIdentity,
+			ExtraOpts: map[string]bool{
+				"pubsub": true,
+			},
+		})
+		if err != nil {
+			return nil, err
+		}
+		nodes[i] = node
+		apis[i], err = coreapi.NewCoreAPI(node)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err := mn.LinkAll()
+	if err != nil {
+		return nil, err
+	}
+
+	bsinf := core.BootstrapConfigWithPeers(
+		[]pstore.PeerInfo{
+			nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
+		},
+	)
+
+	for _, n := range nodes[1:] {
+		if err := n.Bootstrap(bsinf); err != nil {
+			return nil, err
+		}
+	}
+
+	return apis, nil
+}
+
+func makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
+	api, err := makeAPISwarm(ctx, false, 1)
+	if err != nil {
+		return nil, err
+	}
+
+	return api[0], nil
+}
+
+
+func TestApi(t *testing.T) {
+	t.Run("Block", TestBlock)
+	t.Run("TestDag", TestDag)
+	t.Run("TestDht", TestDht)
+	t.Run("TestKey", TestKey)
+	t.Run("TestName", TestName)
+	t.Run("TestObject", TestObject)
+	t.Run("TestPath", TestPath)
+	t.Run("TestPin", TestPin)
+	t.Run("TestPubSub", TestPubSub)
+	t.Run("TestUnixfs", TestUnixfs)
+}
diff --git a/core/coreiface/tests/block_test.go b/core/coreiface/tests/block.go
similarity index 92%
rename from core/coreiface/tests/block_test.go
rename to core/coreiface/tests/block.go
index 81360b150..07679a926 100644
--- a/core/coreiface/tests/block_test.go
+++ b/core/coreiface/tests/block.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -12,6 +12,15 @@ import (
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
+func TestBlock(t *testing.T) {
+	t.Run("TestBlockPut", TestBlockPut)
+	t.Run("TestBlockPutFormat", TestBlockPutFormat)
+	t.Run("TestBlockPutHash", TestBlockPutHash)
+	t.Run("TestBlockGet", TestBlockGet)
+	t.Run("TestBlockRm", TestBlockRm)
+	t.Run("TestBlockStat", TestBlockStat)
+}
+
 func TestBlockPut(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
diff --git a/core/coreiface/tests/dag_test.go b/core/coreiface/tests/dag.go
similarity index 92%
rename from core/coreiface/tests/dag_test.go
rename to core/coreiface/tests/dag.go
index 17059192b..a75438ab1 100644
--- a/core/coreiface/tests/dag_test.go
+++ b/core/coreiface/tests/dag.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -12,6 +12,14 @@ import (
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
+func TestDag(t *testing.T) {
+	t.Run("TestPut", TestPut)
+	t.Run("TestPutWithHash", TestPutWithHash)
+	t.Run("TestPath", TestDagPath)
+	t.Run("TestTree", TestTree)
+	t.Run("TestBatch", TestBatch)
+}
+
 var (
 	treeExpected = map[string]struct{}{
 		"a":   {},
@@ -56,7 +64,7 @@ func TestPutWithHash(t *testing.T) {
 	}
 }
 
-func TestPath(t *testing.T) {
+func TestDagPath(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
 	if err != nil {
diff --git a/core/coreiface/tests/dht_test.go b/core/coreiface/tests/dht.go
similarity index 93%
rename from core/coreiface/tests/dht_test.go
rename to core/coreiface/tests/dht.go
index be16bb083..429197f70 100644
--- a/core/coreiface/tests/dht_test.go
+++ b/core/coreiface/tests/dht.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -8,6 +8,12 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestDht(t *testing.T) {
+	t.Run("TestDhtFindPeer", TestDhtFindPeer)
+	t.Run("TestDhtFindProviders", TestDhtFindProviders)
+	t.Run("TestDhtProvide", TestDhtProvide)
+}
+
 func TestDhtFindPeer(t *testing.T) {
 	ctx := context.Background()
 	apis, err := makeAPISwarm(ctx, true, 5)
diff --git a/core/coreiface/tests/key_test.go b/core/coreiface/tests/key.go
similarity index 93%
rename from core/coreiface/tests/key_test.go
rename to core/coreiface/tests/key.go
index 21884e448..b08f56a4f 100644
--- a/core/coreiface/tests/key_test.go
+++ b/core/coreiface/tests/key.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -8,6 +8,23 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestKey(t *testing.T) {
+	t.Run("TestListSelf", TestListSelf)
+	t.Run("TestRenameSelf", TestRenameSelf)
+	t.Run("TestRemoveSelf", TestRemoveSelf)
+	t.Run("TestGenerateSize", TestGenerateSize)
+	t.Run("TestGenerateExisting", TestGenerateExisting)
+	t.Run("TestList", TestList)
+	t.Run("TestRename", TestRename)
+	t.Run("TestRenameToSelf", TestRenameToSelf)
+	t.Run("TestRenameToSelfForce", TestRenameToSelfForce)
+	t.Run("TestRenameOverwriteNoForce", TestRenameOverwriteNoForce)
+	t.Run("TestRenameOverwrite", TestRenameOverwrite)
+	t.Run("TestRenameSameNameNoForce", TestRenameSameNameNoForce)
+	t.Run("TestRenameSameName", TestRenameSameName)
+	t.Run("TestRemove", TestRemove)
+}
+
 func TestListSelf(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
diff --git a/core/coreiface/tests/name_test.go b/core/coreiface/tests/name.go
similarity index 97%
rename from core/coreiface/tests/name_test.go
rename to core/coreiface/tests/name.go
index a3514e051..154c1d444 100644
--- a/core/coreiface/tests/name_test.go
+++ b/core/coreiface/tests/name.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -15,6 +15,11 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestName(t *testing.T) {
+	t.Run("TestPublishResolve", TestPublishResolve)
+	t.Run("TestBasicPublishResolveKey", TestBasicPublishResolveKey)
+}
+
 var rnd = rand.New(rand.NewSource(0x62796532303137))
 
 func addTestObject(ctx context.Context, api coreiface.CoreAPI) (coreiface.Path, error) {
diff --git a/core/coreiface/tests/object_test.go b/core/coreiface/tests/object.go
similarity index 93%
rename from core/coreiface/tests/object_test.go
rename to core/coreiface/tests/object.go
index ac9e1d5f3..7d4243bca 100644
--- a/core/coreiface/tests/object_test.go
+++ b/core/coreiface/tests/object.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"bytes"
@@ -12,6 +12,21 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestObject(t *testing.T) {
+	t.Run("TestNew", TestNew)
+	t.Run("TestObjectPut", TestObjectPut)
+	t.Run("TestObjectGet", TestObjectGet)
+	t.Run("TestObjectData", TestObjectData)
+	t.Run("TestObjectLinks", TestObjectLinks)
+	t.Run("TestObjectStat", TestObjectStat)
+	t.Run("TestObjectAddLink", TestObjectAddLink)
+	t.Run("TestObjectAddLinkCreate", TestObjectAddLinkCreate)
+	t.Run("TestObjectRmLink", TestObjectRmLink)
+	t.Run("TestObjectAddData", TestObjectAddData)
+	t.Run("TestObjectSetData", TestObjectSetData)
+	t.Run("TestDiffTest", TestDiffTest)
+}
+
 func TestNew(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
diff --git a/core/coreiface/tests/path_test.go b/core/coreiface/tests/path.go
similarity index 91%
rename from core/coreiface/tests/path_test.go
rename to core/coreiface/tests/path.go
index e05428073..efbacd29f 100644
--- a/core/coreiface/tests/path_test.go
+++ b/core/coreiface/tests/path.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -9,6 +9,14 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestPath(t *testing.T) {
+	t.Run("TestMutablePath", TestMutablePath)
+	t.Run("TestPathRemainder", TestPathRemainder)
+	t.Run("TestEmptyPathRemainder", TestEmptyPathRemainder)
+	t.Run("TestInvalidPathRemainder", TestInvalidPathRemainder)
+	t.Run("TestPathRoot", TestPathRoot)
+}
+
 func TestMutablePath(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
diff --git a/core/coreiface/tests/pin_test.go b/core/coreiface/tests/pin.go
similarity index 95%
rename from core/coreiface/tests/pin_test.go
rename to core/coreiface/tests/pin.go
index 5c4b82bc2..344cd0db7 100644
--- a/core/coreiface/tests/pin_test.go
+++ b/core/coreiface/tests/pin.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -8,6 +8,12 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
+func TestPin(t *testing.T) {
+	t.Run("TestPinAdd", TestPinAdd)
+	t.Run("TestPinSimple", TestPinSimple)
+	t.Run("TestPinRecursive", TestPinRecursive)
+}
+
 func TestPinAdd(t *testing.T) {
 	ctx := context.Background()
 	api, err := makeAPI(ctx)
diff --git a/core/coreiface/tests/pubsub_test.go b/core/coreiface/tests/pubsub.go
similarity index 95%
rename from core/coreiface/tests/pubsub_test.go
rename to core/coreiface/tests/pubsub.go
index 19a1eba52..3ecd80274 100644
--- a/core/coreiface/tests/pubsub_test.go
+++ b/core/coreiface/tests/pubsub.go
@@ -1,4 +1,4 @@
-package tests_test
+package tests
 
 import (
 	"context"
@@ -7,6 +7,10 @@ import (
 	"time"
 )
 
+func TestPubSub(t *testing.T) {
+	t.Run("TestBasicPubSub", TestBasicPubSub)
+}
+
 func TestBasicPubSub(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/core/coreiface/tests/unixfs_test.go b/core/coreiface/tests/unixfs.go
similarity index 89%
rename from core/coreiface/tests/unixfs_test.go
rename to core/coreiface/tests/unixfs.go
index d7ddae963..1ca0b282a 100644
--- a/core/coreiface/tests/unixfs_test.go
+++ b/core/coreiface/tests/unixfs.go
@@ -1,11 +1,8 @@
-package tests_test
+package tests
 
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
-	"fmt"
-	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	"io"
 	"io/ioutil"
 	"math"
@@ -15,28 +12,31 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core"
-	"github.com/ipfs/go-ipfs/core/coreapi"
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-	mock "github.com/ipfs/go-ipfs/core/mock"
-	"github.com/ipfs/go-ipfs/keystore"
-	"github.com/ipfs/go-ipfs/repo"
 
-	ci "gx/ipfs/QmNiJiXwWE3kRhZrC5ej3kSjWHm337pYfhjLGSCDNKJP2s/go-libp2p-crypto"
-	"gx/ipfs/QmRBaUEQEeFWywfrZJ64QgsmvcqgLSK3VbvGMR2NM2Edpf/go-libp2p/p2p/net/mock"
+	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
 	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
-	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
-	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 	"gx/ipfs/Qmbvw7kpSM2p6rbQ57WGRhhqNfCiNGW6EKH4xgHLw4bsnB/go-unixfs"
-	"gx/ipfs/QmcZfkbgwwwH5ZLTQRHkSQBDiDqd3skY2eU6MZRgWuXcse/go-ipfs-config"
 	mdag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
-	"gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore"
-	syncds "gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore/sync"
 )
 
+func TestUnixfs(t *testing.T) {
+	t.Run("TestAdd", TestAdd)
+	t.Run("TestAddPinned", TestAddPinned)
+	t.Run("TestAddHashOnly", TestAddHashOnly)
+	t.Run("TestGetEmptyFile", TestGetEmptyFile)
+	t.Run("TestGetDir", TestGetDir)
+	t.Run("TestGetNonUnixfs", TestGetNonUnixfs)
+	t.Run("TestLs", TestLs)
+	t.Run("TestEntriesExpired", TestEntriesExpired)
+	t.Run("TestLsEmptyDir", TestLsEmptyDir)
+	t.Run("TestLsNonUnixfs", TestLsNonUnixfs)
+	t.Run("TestAddCloses", TestAddCloses)
+}
+
 const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
 
 // `echo -n 'hello, world!' | ipfs add`
@@ -46,97 +46,6 @@ var helloStr = "hello, world!"
 // `echo -n | ipfs add`
 var emptyFile = "/ipfs/QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH"
 
-func makeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
-	mn := mocknet.New(ctx)
-
-	nodes := make([]*core.IpfsNode, n)
-	apis := make([]coreiface.CoreAPI, n)
-
-	for i := 0; i < n; i++ {
-		var ident config.Identity
-		if fullIdentity {
-			sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
-			if err != nil {
-				return nil, err
-			}
-
-			id, err := peer.IDFromPublicKey(pk)
-			if err != nil {
-				return nil, err
-			}
-
-			kbytes, err := sk.Bytes()
-			if err != nil {
-				return nil, err
-			}
-
-			ident = config.Identity{
-				PeerID:  id.Pretty(),
-				PrivKey: base64.StdEncoding.EncodeToString(kbytes),
-			}
-		} else {
-			ident = config.Identity{
-				PeerID: testPeerID,
-			}
-		}
-
-		c := config.Config{}
-		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
-		c.Identity = ident
-
-		r := &repo.Mock{
-			C: c,
-			D: syncds.MutexWrap(datastore.NewMapDatastore()),
-			K: keystore.NewMemKeystore(),
-		}
-
-		node, err := core.NewNode(ctx, &core.BuildCfg{
-			Repo:   r,
-			Host:   mock.MockHostOption(mn),
-			Online: fullIdentity,
-			ExtraOpts: map[string]bool{
-				"pubsub": true,
-			},
-		})
-		if err != nil {
-			return nil, err
-		}
-		nodes[i] = node
-		apis[i], err = coreapi.NewCoreAPI(node)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	err := mn.LinkAll()
-	if err != nil {
-		return nil, err
-	}
-
-	bsinf := core.BootstrapConfigWithPeers(
-		[]pstore.PeerInfo{
-			nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
-		},
-	)
-
-	for _, n := range nodes[1:] {
-		if err := n.Bootstrap(bsinf); err != nil {
-			return nil, err
-		}
-	}
-
-	return apis, nil
-}
-
-func makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
-	api, err := makeAPISwarm(ctx, false, 1)
-	if err != nil {
-		return nil, err
-	}
-
-	return api[0], nil
-}
-
 func strFile(data string) func() files.Node {
 	return func() files.Node {
 		return files.NewBytesFile([]byte(data))

From cba8f3c2a51e6b4afeeabec713d6fe0c699bae57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Dec 2018 21:01:00 +0100
Subject: [PATCH 159/247] coreapi: Interface for external test providers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@1532d2602204f7c279b22db1ebcb960f82e67050

This commit was moved from ipfs/boxo@9e88033a986fbd3454d5b438e3590b871ae0987d
---
 core/coreiface/tests/api.go    | 138 +++++++--------------------------
 core/coreiface/tests/block.go  |  38 ++++-----
 core/coreiface/tests/dag.go    |  32 ++++----
 core/coreiface/tests/dht.go    |  20 ++---
 core/coreiface/tests/key.go    | 105 +++++++++++++------------
 core/coreiface/tests/name.go   |  19 ++---
 core/coreiface/tests/object.go |  74 +++++++++---------
 core/coreiface/tests/path.go   |  32 ++++----
 core/coreiface/tests/pin.go    |  20 ++---
 core/coreiface/tests/pubsub.go |   8 +-
 core/coreiface/tests/unixfs.go |  70 ++++++++---------
 11 files changed, 238 insertions(+), 318 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 8baa869dd..a4b0312f6 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -2,111 +2,13 @@ package tests
 
 import (
 	"context"
-	"encoding/base64"
-	"fmt"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core"
-	"github.com/ipfs/go-ipfs/core/coreapi"
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	mock "github.com/ipfs/go-ipfs/core/mock"
-	"github.com/ipfs/go-ipfs/keystore"
-	"github.com/ipfs/go-ipfs/repo"
-
-	ci "gx/ipfs/QmNiJiXwWE3kRhZrC5ej3kSjWHm337pYfhjLGSCDNKJP2s/go-libp2p-crypto"
-	"gx/ipfs/QmRBaUEQEeFWywfrZJ64QgsmvcqgLSK3VbvGMR2NM2Edpf/go-libp2p/p2p/net/mock"
-	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
-	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
-	"gx/ipfs/QmcZfkbgwwwH5ZLTQRHkSQBDiDqd3skY2eU6MZRgWuXcse/go-ipfs-config"
-	"gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore"
-	syncds "gx/ipfs/Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM/go-datastore/sync"
 )
 
-
-func makeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
-	mn := mocknet.New(ctx)
-
-	nodes := make([]*core.IpfsNode, n)
-	apis := make([]coreiface.CoreAPI, n)
-
-	for i := 0; i < n; i++ {
-		var ident config.Identity
-		if fullIdentity {
-			sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
-			if err != nil {
-				return nil, err
-			}
-
-			id, err := peer.IDFromPublicKey(pk)
-			if err != nil {
-				return nil, err
-			}
-
-			kbytes, err := sk.Bytes()
-			if err != nil {
-				return nil, err
-			}
-
-			ident = config.Identity{
-				PeerID:  id.Pretty(),
-				PrivKey: base64.StdEncoding.EncodeToString(kbytes),
-			}
-		} else {
-			ident = config.Identity{
-				PeerID: testPeerID,
-			}
-		}
-
-		c := config.Config{}
-		c.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.%d.1/tcp/4001", i)}
-		c.Identity = ident
-
-		r := &repo.Mock{
-			C: c,
-			D: syncds.MutexWrap(datastore.NewMapDatastore()),
-			K: keystore.NewMemKeystore(),
-		}
-
-		node, err := core.NewNode(ctx, &core.BuildCfg{
-			Repo:   r,
-			Host:   mock.MockHostOption(mn),
-			Online: fullIdentity,
-			ExtraOpts: map[string]bool{
-				"pubsub": true,
-			},
-		})
-		if err != nil {
-			return nil, err
-		}
-		nodes[i] = node
-		apis[i], err = coreapi.NewCoreAPI(node)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	err := mn.LinkAll()
-	if err != nil {
-		return nil, err
-	}
-
-	bsinf := core.BootstrapConfigWithPeers(
-		[]pstore.PeerInfo{
-			nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
-		},
-	)
-
-	for _, n := range nodes[1:] {
-		if err := n.Bootstrap(bsinf); err != nil {
-			return nil, err
-		}
-	}
-
-	return apis, nil
-}
-
-func makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
-	api, err := makeAPISwarm(ctx, false, 1)
+func (tp *provider) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
+	api, err := tp.MakeAPISwarm(ctx, false, 1)
 	if err != nil {
 		return nil, err
 	}
@@ -114,16 +16,28 @@ func makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
 	return api[0], nil
 }
 
-
-func TestApi(t *testing.T) {
-	t.Run("Block", TestBlock)
-	t.Run("TestDag", TestDag)
-	t.Run("TestDht", TestDht)
-	t.Run("TestKey", TestKey)
-	t.Run("TestName", TestName)
-	t.Run("TestObject", TestObject)
-	t.Run("TestPath", TestPath)
-	t.Run("TestPin", TestPin)
-	t.Run("TestPubSub", TestPubSub)
-	t.Run("TestUnixfs", TestUnixfs)
+type Provider interface {
+	// Make creates n nodes. fullIdentity set to false can be ignored
+	MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error)
+}
+
+type provider struct {
+	Provider
+}
+
+func TestApi(p Provider) func(t *testing.T) {
+	tp := &provider{p}
+
+	return func(t *testing.T) {
+		t.Run("Block", tp.TestBlock)
+		t.Run("Dag", tp.TestDag)
+		t.Run("Dht", tp.TestDht)
+		t.Run("Key", tp.TestKey)
+		t.Run("Name", tp.TestName)
+		t.Run("Object", tp.TestObject)
+		t.Run("Path", tp.TestPath)
+		t.Run("Pin", tp.TestPin)
+		t.Run("PubSub", tp.TestPubSub)
+		t.Run("Unixfs", tp.TestUnixfs)
+	}
 }
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 07679a926..0ee968860 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -12,18 +12,18 @@ import (
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
-func TestBlock(t *testing.T) {
-	t.Run("TestBlockPut", TestBlockPut)
-	t.Run("TestBlockPutFormat", TestBlockPutFormat)
-	t.Run("TestBlockPutHash", TestBlockPutHash)
-	t.Run("TestBlockGet", TestBlockGet)
-	t.Run("TestBlockRm", TestBlockRm)
-	t.Run("TestBlockStat", TestBlockStat)
+func (tp *provider) TestBlock(t *testing.T) {
+	t.Run("TestBlockPut", tp.TestBlockPut)
+	t.Run("TestBlockPutFormat", tp.TestBlockPutFormat)
+	t.Run("TestBlockPutHash", tp.TestBlockPutHash)
+	t.Run("TestBlockGet", tp.TestBlockGet)
+	t.Run("TestBlockRm", tp.TestBlockRm)
+	t.Run("TestBlockStat", tp.TestBlockStat)
 }
 
-func TestBlockPut(t *testing.T) {
+func (tp *provider) TestBlockPut(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -38,9 +38,9 @@ func TestBlockPut(t *testing.T) {
 	}
 }
 
-func TestBlockPutFormat(t *testing.T) {
+func (tp *provider) TestBlockPutFormat(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -55,9 +55,9 @@ func TestBlockPutFormat(t *testing.T) {
 	}
 }
 
-func TestBlockPutHash(t *testing.T) {
+func (tp *provider) TestBlockPutHash(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -72,9 +72,9 @@ func TestBlockPutHash(t *testing.T) {
 	}
 }
 
-func TestBlockGet(t *testing.T) {
+func (tp *provider) TestBlockGet(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -112,9 +112,9 @@ func TestBlockGet(t *testing.T) {
 	}
 }
 
-func TestBlockRm(t *testing.T) {
+func (tp *provider) TestBlockRm(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -165,9 +165,9 @@ func TestBlockRm(t *testing.T) {
 	}
 }
 
-func TestBlockStat(t *testing.T) {
+func (tp *provider) TestBlockStat(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index a75438ab1..f19216221 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -12,12 +12,12 @@ import (
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
-func TestDag(t *testing.T) {
-	t.Run("TestPut", TestPut)
-	t.Run("TestPutWithHash", TestPutWithHash)
-	t.Run("TestPath", TestDagPath)
-	t.Run("TestTree", TestTree)
-	t.Run("TestBatch", TestBatch)
+func (tp *provider) TestDag(t *testing.T) {
+	t.Run("TestPut", tp.TestPut)
+	t.Run("TestPutWithHash", tp.TestPutWithHash)
+	t.Run("TestPath", tp.TestDagPath)
+	t.Run("TestTree", tp.TestTree)
+	t.Run("TestBatch", tp.TestBatch)
 }
 
 var (
@@ -30,9 +30,9 @@ var (
 	}
 )
 
-func TestPut(t *testing.T) {
+func (tp *provider) TestPut(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -47,9 +47,9 @@ func TestPut(t *testing.T) {
 	}
 }
 
-func TestPutWithHash(t *testing.T) {
+func (tp *provider) TestPutWithHash(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -64,9 +64,9 @@ func TestPutWithHash(t *testing.T) {
 	}
 }
 
-func TestDagPath(t *testing.T) {
+func (tp *provider) TestDagPath(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -96,9 +96,9 @@ func TestDagPath(t *testing.T) {
 	}
 }
 
-func TestTree(t *testing.T) {
+func (tp *provider) TestTree(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -125,9 +125,9 @@ func TestTree(t *testing.T) {
 	}
 }
 
-func TestBatch(t *testing.T) {
+func (tp *provider) TestBatch(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 429197f70..9269bc4c5 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -8,15 +8,15 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestDht(t *testing.T) {
-	t.Run("TestDhtFindPeer", TestDhtFindPeer)
-	t.Run("TestDhtFindProviders", TestDhtFindProviders)
-	t.Run("TestDhtProvide", TestDhtProvide)
+func (tp *provider) TestDht(t *testing.T) {
+	t.Run("TestDhtFindPeer", tp.TestDhtFindPeer)
+	t.Run("TestDhtFindProviders", tp.TestDhtFindProviders)
+	t.Run("TestDhtProvide", tp.TestDhtProvide)
 }
 
-func TestDhtFindPeer(t *testing.T) {
+func (tp *provider) TestDhtFindPeer(t *testing.T) {
 	ctx := context.Background()
-	apis, err := makeAPISwarm(ctx, true, 5)
+	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -50,9 +50,9 @@ func TestDhtFindPeer(t *testing.T) {
 	}
 }
 
-func TestDhtFindProviders(t *testing.T) {
+func (tp *provider) TestDhtFindProviders(t *testing.T) {
 	ctx := context.Background()
-	apis, err := makeAPISwarm(ctx, true, 5)
+	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -79,9 +79,9 @@ func TestDhtFindProviders(t *testing.T) {
 	}
 }
 
-func TestDhtProvide(t *testing.T) {
+func (tp *provider) TestDhtProvide(t *testing.T) {
 	ctx := context.Background()
-	apis, err := makeAPISwarm(ctx, true, 5)
+	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index b08f56a4f..c2b892599 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -8,31 +8,38 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestKey(t *testing.T) {
-	t.Run("TestListSelf", TestListSelf)
-	t.Run("TestRenameSelf", TestRenameSelf)
-	t.Run("TestRemoveSelf", TestRemoveSelf)
-	t.Run("TestGenerateSize", TestGenerateSize)
-	t.Run("TestGenerateExisting", TestGenerateExisting)
-	t.Run("TestList", TestList)
-	t.Run("TestRename", TestRename)
-	t.Run("TestRenameToSelf", TestRenameToSelf)
-	t.Run("TestRenameToSelfForce", TestRenameToSelfForce)
-	t.Run("TestRenameOverwriteNoForce", TestRenameOverwriteNoForce)
-	t.Run("TestRenameOverwrite", TestRenameOverwrite)
-	t.Run("TestRenameSameNameNoForce", TestRenameSameNameNoForce)
-	t.Run("TestRenameSameName", TestRenameSameName)
-	t.Run("TestRemove", TestRemove)
+func (tp *provider) TestKey(t *testing.T) {
+	t.Run("TestListSelf", tp.TestListSelf)
+	t.Run("TestRenameSelf", tp.TestRenameSelf)
+	t.Run("TestRemoveSelf", tp.TestRemoveSelf)
+	t.Run("TestGenerate", tp.TestGenerate)
+	t.Run("TestGenerateSize", tp.TestGenerateSize)
+	t.Run("TestGenerateType", tp.TestGenerateType)
+	t.Run("TestGenerateExisting", tp.TestGenerateExisting)
+	t.Run("TestList", tp.TestList)
+	t.Run("TestRename", tp.TestRename)
+	t.Run("TestRenameToSelf", tp.TestRenameToSelf)
+	t.Run("TestRenameToSelfForce", tp.TestRenameToSelfForce)
+	t.Run("TestRenameOverwriteNoForce", tp.TestRenameOverwriteNoForce)
+	t.Run("TestRenameOverwrite", tp.TestRenameOverwrite)
+	t.Run("TestRenameSameNameNoForce", tp.TestRenameSameNameNoForce)
+	t.Run("TestRenameSameName", tp.TestRenameSameName)
+	t.Run("TestRemove", tp.TestRemove)
 }
 
-func TestListSelf(t *testing.T) {
+func (tp *provider) TestListSelf(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 		return
 	}
 
+	self, err := api.Key().Self(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	keys, err := api.Key().List(ctx)
 	if err != nil {
 		t.Fatalf("failed to list keys: %s", err)
@@ -48,14 +55,14 @@ func TestListSelf(t *testing.T) {
 		t.Errorf("expected the key to be called 'self', got '%s'", keys[0].Name())
 	}
 
-	if keys[0].Path().String() != "/ipns/"+testPeerID {
-		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", testPeerID, keys[0].Path().String())
+	if keys[0].Path().String() != "/ipns/"+self.ID().Pretty() {
+		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", self.ID().Pretty(), keys[0].Path().String())
 	}
 }
 
-func TestRenameSelf(t *testing.T) {
+func (tp *provider) TestRenameSelf(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 		return
@@ -80,9 +87,9 @@ func TestRenameSelf(t *testing.T) {
 	}
 }
 
-func TestRemoveSelf(t *testing.T) {
+func (tp *provider) TestRemoveSelf(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 		return
@@ -98,9 +105,9 @@ func TestRemoveSelf(t *testing.T) {
 	}
 }
 
-func TestGenerate(t *testing.T) {
+func (tp *provider) TestGenerate(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -120,9 +127,9 @@ func TestGenerate(t *testing.T) {
 	}
 }
 
-func TestGenerateSize(t *testing.T) {
+func (tp *provider) TestGenerateSize(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -142,11 +149,11 @@ func TestGenerateSize(t *testing.T) {
 	}
 }
 
-func TestGenerateType(t *testing.T) {
+func (tp *provider) TestGenerateType(t *testing.T) {
 	ctx := context.Background()
 	t.Skip("disabled until libp2p/specs#111 is fixed")
 
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -167,9 +174,9 @@ func TestGenerateType(t *testing.T) {
 	}
 }
 
-func TestGenerateExisting(t *testing.T) {
+func (tp *provider) TestGenerateExisting(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -199,9 +206,9 @@ func TestGenerateExisting(t *testing.T) {
 	}
 }
 
-func TestList(t *testing.T) {
+func (tp *provider) TestList(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -244,9 +251,9 @@ func TestList(t *testing.T) {
 	}
 }
 
-func TestRename(t *testing.T) {
+func (tp *provider) TestRename(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -272,9 +279,9 @@ func TestRename(t *testing.T) {
 	}
 }
 
-func TestRenameToSelf(t *testing.T) {
+func (tp *provider) TestRenameToSelf(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -295,9 +302,9 @@ func TestRenameToSelf(t *testing.T) {
 	}
 }
 
-func TestRenameToSelfForce(t *testing.T) {
+func (tp *provider) TestRenameToSelfForce(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -318,9 +325,9 @@ func TestRenameToSelfForce(t *testing.T) {
 	}
 }
 
-func TestRenameOverwriteNoForce(t *testing.T) {
+func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -347,9 +354,9 @@ func TestRenameOverwriteNoForce(t *testing.T) {
 	}
 }
 
-func TestRenameOverwrite(t *testing.T) {
+func (tp *provider) TestRenameOverwrite(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -385,9 +392,9 @@ func TestRenameOverwrite(t *testing.T) {
 	}
 }
 
-func TestRenameSameNameNoForce(t *testing.T) {
+func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -413,9 +420,9 @@ func TestRenameSameNameNoForce(t *testing.T) {
 	}
 }
 
-func TestRenameSameName(t *testing.T) {
+func (tp *provider) TestRenameSameName(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -441,9 +448,9 @@ func TestRenameSameName(t *testing.T) {
 	}
 }
 
-func TestRemove(t *testing.T) {
+func (tp *provider) TestRemove(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 154c1d444..ecb06ddde 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -15,9 +15,10 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestName(t *testing.T) {
-	t.Run("TestPublishResolve", TestPublishResolve)
-	t.Run("TestBasicPublishResolveKey", TestBasicPublishResolveKey)
+func (tp *provider) TestName(t *testing.T) {
+	t.Run("TestPublishResolve", tp.TestPublishResolve)
+	t.Run("TestBasicPublishResolveKey", tp.TestBasicPublishResolveKey)
+	t.Run("TestBasicPublishResolveTimeout", tp.TestBasicPublishResolveTimeout)
 }
 
 var rnd = rand.New(rand.NewSource(0x62796532303137))
@@ -34,10 +35,10 @@ func appendPath(p coreiface.Path, sub string) coreiface.Path {
 	return p
 }
 
-func TestPublishResolve(t *testing.T) {
+func (tp *provider) TestPublishResolve(t *testing.T) {
 	ctx := context.Background()
 	init := func() (coreiface.CoreAPI, coreiface.Path) {
-		apis, err := makeAPISwarm(ctx, true, 5)
+		apis, err := tp.MakeAPISwarm(ctx, true, 5)
 		if err != nil {
 			t.Fatal(err)
 			return nil, nil
@@ -183,9 +184,9 @@ func TestPublishResolve(t *testing.T) {
 	})
 }
 
-func TestBasicPublishResolveKey(t *testing.T) {
+func (tp *provider) TestBasicPublishResolveKey(t *testing.T) {
 	ctx := context.Background()
-	apis, err := makeAPISwarm(ctx, true, 5)
+	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -224,11 +225,11 @@ func TestBasicPublishResolveKey(t *testing.T) {
 	}
 }
 
-func TestBasicPublishResolveTimeout(t *testing.T) {
+func (tp *provider) TestBasicPublishResolveTimeout(t *testing.T) {
 	t.Skip("ValidTime doesn't appear to work at this time resolution")
 
 	ctx := context.Background()
-	apis, err := makeAPISwarm(ctx, true, 5)
+	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 7d4243bca..349b4a8f5 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -12,24 +12,24 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestObject(t *testing.T) {
-	t.Run("TestNew", TestNew)
-	t.Run("TestObjectPut", TestObjectPut)
-	t.Run("TestObjectGet", TestObjectGet)
-	t.Run("TestObjectData", TestObjectData)
-	t.Run("TestObjectLinks", TestObjectLinks)
-	t.Run("TestObjectStat", TestObjectStat)
-	t.Run("TestObjectAddLink", TestObjectAddLink)
-	t.Run("TestObjectAddLinkCreate", TestObjectAddLinkCreate)
-	t.Run("TestObjectRmLink", TestObjectRmLink)
-	t.Run("TestObjectAddData", TestObjectAddData)
-	t.Run("TestObjectSetData", TestObjectSetData)
-	t.Run("TestDiffTest", TestDiffTest)
+func (tp *provider) TestObject(t *testing.T) {
+	t.Run("TestNew", tp.TestNew)
+	t.Run("TestObjectPut", tp.TestObjectPut)
+	t.Run("TestObjectGet", tp.TestObjectGet)
+	t.Run("TestObjectData", tp.TestObjectData)
+	t.Run("TestObjectLinks", tp.TestObjectLinks)
+	t.Run("TestObjectStat", tp.TestObjectStat)
+	t.Run("TestObjectAddLink", tp.TestObjectAddLink)
+	t.Run("TestObjectAddLinkCreate", tp.TestObjectAddLinkCreate)
+	t.Run("TestObjectRmLink", tp.TestObjectRmLink)
+	t.Run("TestObjectAddData", tp.TestObjectAddData)
+	t.Run("TestObjectSetData", tp.TestObjectSetData)
+	t.Run("TestDiffTest", tp.TestDiffTest)
 }
 
-func TestNew(t *testing.T) {
+func (tp *provider) TestNew(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -53,9 +53,9 @@ func TestNew(t *testing.T) {
 	}
 }
 
-func TestObjectPut(t *testing.T) {
+func (tp *provider) TestObjectPut(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -93,9 +93,9 @@ func TestObjectPut(t *testing.T) {
 	}
 }
 
-func TestObjectGet(t *testing.T) {
+func (tp *provider) TestObjectGet(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -115,9 +115,9 @@ func TestObjectGet(t *testing.T) {
 	}
 }
 
-func TestObjectData(t *testing.T) {
+func (tp *provider) TestObjectData(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -142,9 +142,9 @@ func TestObjectData(t *testing.T) {
 	}
 }
 
-func TestObjectLinks(t *testing.T) {
+func (tp *provider) TestObjectLinks(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -177,9 +177,9 @@ func TestObjectLinks(t *testing.T) {
 	}
 }
 
-func TestObjectStat(t *testing.T) {
+func (tp *provider) TestObjectStat(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -224,9 +224,9 @@ func TestObjectStat(t *testing.T) {
 	}
 }
 
-func TestObjectAddLink(t *testing.T) {
+func (tp *provider) TestObjectAddLink(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -264,9 +264,9 @@ func TestObjectAddLink(t *testing.T) {
 	}
 }
 
-func TestObjectAddLinkCreate(t *testing.T) {
+func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -312,9 +312,9 @@ func TestObjectAddLinkCreate(t *testing.T) {
 	}
 }
 
-func TestObjectRmLink(t *testing.T) {
+func (tp *provider) TestObjectRmLink(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -344,9 +344,9 @@ func TestObjectRmLink(t *testing.T) {
 	}
 }
 
-func TestObjectAddData(t *testing.T) {
+func (tp *provider) TestObjectAddData(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -373,9 +373,9 @@ func TestObjectAddData(t *testing.T) {
 	}
 }
 
-func TestObjectSetData(t *testing.T) {
+func (tp *provider) TestObjectSetData(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -402,9 +402,9 @@ func TestObjectSetData(t *testing.T) {
 	}
 }
 
-func TestDiffTest(t *testing.T) {
+func (tp *provider) TestDiffTest(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index efbacd29f..cb1246366 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -9,17 +9,17 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestPath(t *testing.T) {
-	t.Run("TestMutablePath", TestMutablePath)
-	t.Run("TestPathRemainder", TestPathRemainder)
-	t.Run("TestEmptyPathRemainder", TestEmptyPathRemainder)
-	t.Run("TestInvalidPathRemainder", TestInvalidPathRemainder)
-	t.Run("TestPathRoot", TestPathRoot)
+func (tp *provider) TestPath(t *testing.T) {
+	t.Run("TestMutablePath", tp.TestMutablePath)
+	t.Run("TestPathRemainder", tp.TestPathRemainder)
+	t.Run("TestEmptyPathRemainder", tp.TestEmptyPathRemainder)
+	t.Run("TestInvalidPathRemainder", tp.TestInvalidPathRemainder)
+	t.Run("TestPathRoot", tp.TestPathRoot)
 }
 
-func TestMutablePath(t *testing.T) {
+func (tp *provider) TestMutablePath(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -44,9 +44,9 @@ func TestMutablePath(t *testing.T) {
 	}
 }
 
-func TestPathRemainder(t *testing.T) {
+func (tp *provider) TestPathRemainder(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -71,9 +71,9 @@ func TestPathRemainder(t *testing.T) {
 	}
 }
 
-func TestEmptyPathRemainder(t *testing.T) {
+func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -102,9 +102,9 @@ func TestEmptyPathRemainder(t *testing.T) {
 	}
 }
 
-func TestInvalidPathRemainder(t *testing.T) {
+func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -125,9 +125,9 @@ func TestInvalidPathRemainder(t *testing.T) {
 	}
 }
 
-func TestPathRoot(t *testing.T) {
+func (tp *provider) TestPathRoot(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 344cd0db7..8c659ba35 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -8,15 +8,15 @@ import (
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
-func TestPin(t *testing.T) {
-	t.Run("TestPinAdd", TestPinAdd)
-	t.Run("TestPinSimple", TestPinSimple)
-	t.Run("TestPinRecursive", TestPinRecursive)
+func (tp *provider) TestPin(t *testing.T) {
+	t.Run("TestPinAdd", tp.TestPinAdd)
+	t.Run("TestPinSimple", tp.TestPinSimple)
+	t.Run("TestPinRecursive", tp.TestPinRecursive)
 }
 
-func TestPinAdd(t *testing.T) {
+func (tp *provider) TestPinAdd(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -32,9 +32,9 @@ func TestPinAdd(t *testing.T) {
 	}
 }
 
-func TestPinSimple(t *testing.T) {
+func (tp *provider) TestPinSimple(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -81,9 +81,9 @@ func TestPinSimple(t *testing.T) {
 	}
 }
 
-func TestPinRecursive(t *testing.T) {
+func (tp *provider) TestPinRecursive(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index 3ecd80274..3462b4755 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -7,15 +7,15 @@ import (
 	"time"
 )
 
-func TestPubSub(t *testing.T) {
-	t.Run("TestBasicPubSub", TestBasicPubSub)
+func (tp *provider) TestPubSub(t *testing.T) {
+	t.Run("TestBasicPubSub", tp.TestBasicPubSub)
 }
 
-func TestBasicPubSub(t *testing.T) {
+func (tp *provider) TestBasicPubSub(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	apis, err := makeAPISwarm(ctx, true, 2)
+	apis, err := tp.MakeAPISwarm(ctx, true, 2)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 1ca0b282a..b31a55d4c 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -23,22 +23,20 @@ import (
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
-func TestUnixfs(t *testing.T) {
-	t.Run("TestAdd", TestAdd)
-	t.Run("TestAddPinned", TestAddPinned)
-	t.Run("TestAddHashOnly", TestAddHashOnly)
-	t.Run("TestGetEmptyFile", TestGetEmptyFile)
-	t.Run("TestGetDir", TestGetDir)
-	t.Run("TestGetNonUnixfs", TestGetNonUnixfs)
-	t.Run("TestLs", TestLs)
-	t.Run("TestEntriesExpired", TestEntriesExpired)
-	t.Run("TestLsEmptyDir", TestLsEmptyDir)
-	t.Run("TestLsNonUnixfs", TestLsNonUnixfs)
-	t.Run("TestAddCloses", TestAddCloses)
+func (tp *provider) TestUnixfs(t *testing.T) {
+	t.Run("TestAdd", tp.TestAdd)
+	t.Run("TestAddPinned", tp.TestAddPinned)
+	t.Run("TestAddHashOnly", tp.TestAddHashOnly)
+	t.Run("TestGetEmptyFile", tp.TestGetEmptyFile)
+	t.Run("TestGetDir", tp.TestGetDir)
+	t.Run("TestGetNonUnixfs", tp.TestGetNonUnixfs)
+	t.Run("TestLs", tp.TestLs)
+	t.Run("TestEntriesExpired", tp.TestEntriesExpired)
+	t.Run("TestLsEmptyDir", tp.TestLsEmptyDir)
+	t.Run("TestLsNonUnixfs", tp.TestLsNonUnixfs)
+	t.Run("TestAddCloses", tp.TestAddCloses)
 }
 
-const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
-
 // `echo -n 'hello, world!' | ipfs add`
 var hello = "/ipfs/QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk"
 var helloStr = "hello, world!"
@@ -80,9 +78,9 @@ func wrapped(name string) func(f files.Node) files.Node {
 	}
 }
 
-func TestAdd(t *testing.T) {
+func (tp *provider) TestAdd(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -537,9 +535,9 @@ func TestAdd(t *testing.T) {
 	}
 }
 
-func TestAddPinned(t *testing.T) {
+func (tp *provider) TestAddPinned(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -559,9 +557,9 @@ func TestAddPinned(t *testing.T) {
 	}
 }
 
-func TestAddHashOnly(t *testing.T) {
+func (tp *provider) TestAddHashOnly(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -584,9 +582,9 @@ func TestAddHashOnly(t *testing.T) {
 	}
 }
 
-func TestGetEmptyFile(t *testing.T) {
+func (tp *provider) TestGetEmptyFile(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -616,9 +614,9 @@ func TestGetEmptyFile(t *testing.T) {
 	}
 }
 
-func TestGetDir(t *testing.T) {
+func (tp *provider) TestGetDir(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -648,9 +646,9 @@ func TestGetDir(t *testing.T) {
 	}
 }
 
-func TestGetNonUnixfs(t *testing.T) {
+func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -667,9 +665,9 @@ func TestGetNonUnixfs(t *testing.T) {
 	}
 }
 
-func TestLs(t *testing.T) {
+func (tp *provider) TestLs(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -703,9 +701,9 @@ func TestLs(t *testing.T) {
 	}
 }
 
-func TestEntriesExpired(t *testing.T) {
+func (tp *provider) TestEntriesExpired(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -746,9 +744,9 @@ func TestEntriesExpired(t *testing.T) {
 	}
 }
 
-func TestLsEmptyDir(t *testing.T) {
+func (tp *provider) TestLsEmptyDir(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -774,9 +772,9 @@ func TestLsEmptyDir(t *testing.T) {
 }
 
 // TODO(lgierth) this should test properly, with len(links) > 0
-func TestLsNonUnixfs(t *testing.T) {
+func (tp *provider) TestLsNonUnixfs(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}
@@ -831,9 +829,9 @@ func (f *closeTestF) Close() error {
 	return nil
 }
 
-func TestAddCloses(t *testing.T) {
+func (tp *provider) TestAddCloses(t *testing.T) {
 	ctx := context.Background()
-	api, err := makeAPI(ctx)
+	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
 	}

From e5a2d8e6f6ac387985f52ccb9eaf3172dc5b88ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Dec 2018 22:27:59 +0100
Subject: [PATCH 160/247] coreapi: make sure to cancel context in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@aa64f771136226accbcae0213eb929ff79697046

This commit was moved from ipfs/boxo@23069a4c459b67e966fa5370e980aaab410e718b
---
 core/coreiface/tests/api.go    | 37 +++++++++++++++++++++++++-
 core/coreiface/tests/block.go  | 18 ++++++++-----
 core/coreiface/tests/dag.go    | 15 +++++++----
 core/coreiface/tests/dht.go    |  9 ++++---
 core/coreiface/tests/key.go    | 48 ++++++++++++++++++++++------------
 core/coreiface/tests/name.go   |  9 ++++---
 core/coreiface/tests/object.go | 36 ++++++++++++++++---------
 core/coreiface/tests/path.go   | 15 +++++++----
 core/coreiface/tests/pin.go    |  9 ++++---
 core/coreiface/tests/unixfs.go | 35 ++++++++++++++++---------
 10 files changed, 165 insertions(+), 66 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index a4b0312f6..ab1feff5b 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"context"
 	"testing"
+	"time"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 )
@@ -21,12 +22,37 @@ type Provider interface {
 	MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error)
 }
 
+func (tp *provider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
+	tp.apis <- 1
+	go func() {
+		<-ctx.Done()
+		tp.apis <- -1
+	}()
+
+	return tp.Provider.MakeAPISwarm(ctx, fullIdentity, n)
+}
+
 type provider struct {
 	Provider
+
+	apis chan int
 }
 
 func TestApi(p Provider) func(t *testing.T) {
-	tp := &provider{p}
+	running := 1
+	apis := make(chan int)
+	zeroRunning := make(chan struct{})
+	go func() {
+		for i := range apis {
+			running += i
+			if running < 1 {
+				close(zeroRunning)
+				return
+			}
+		}
+	}()
+
+	tp := &provider{Provider: p, apis: apis}
 
 	return func(t *testing.T) {
 		t.Run("Block", tp.TestBlock)
@@ -39,5 +65,14 @@ func TestApi(p Provider) func(t *testing.T) {
 		t.Run("Pin", tp.TestPin)
 		t.Run("PubSub", tp.TestPubSub)
 		t.Run("Unixfs", tp.TestUnixfs)
+
+		apis <- -1
+		t.Run("TestsCancelCtx", func(t *testing.T) {
+			select {
+			case <-zeroRunning:
+			case <-time.After(time.Second):
+				t.Errorf("%d node(s) not closed", running)
+			}
+		})
 	}
 }
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 0ee968860..a3a5f93aa 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -22,7 +22,8 @@ func (tp *provider) TestBlock(t *testing.T) {
 }
 
 func (tp *provider) TestBlockPut(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -39,7 +40,8 @@ func (tp *provider) TestBlockPut(t *testing.T) {
 }
 
 func (tp *provider) TestBlockPutFormat(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -56,7 +58,8 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
 }
 
 func (tp *provider) TestBlockPutHash(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -73,7 +76,8 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
 }
 
 func (tp *provider) TestBlockGet(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -113,7 +117,8 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 }
 
 func (tp *provider) TestBlockRm(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -166,7 +171,8 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 }
 
 func (tp *provider) TestBlockStat(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index f19216221..636c38699 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -31,7 +31,8 @@ var (
 )
 
 func (tp *provider) TestPut(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -48,7 +49,8 @@ func (tp *provider) TestPut(t *testing.T) {
 }
 
 func (tp *provider) TestPutWithHash(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -65,7 +67,8 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 }
 
 func (tp *provider) TestDagPath(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -97,7 +100,8 @@ func (tp *provider) TestDagPath(t *testing.T) {
 }
 
 func (tp *provider) TestTree(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -126,7 +130,8 @@ func (tp *provider) TestTree(t *testing.T) {
 }
 
 func (tp *provider) TestBatch(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 9269bc4c5..9b77f1679 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -15,7 +15,8 @@ func (tp *provider) TestDht(t *testing.T) {
 }
 
 func (tp *provider) TestDhtFindPeer(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
@@ -51,7 +52,8 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
 }
 
 func (tp *provider) TestDhtFindProviders(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
@@ -80,7 +82,8 @@ func (tp *provider) TestDhtFindProviders(t *testing.T) {
 }
 
 func (tp *provider) TestDhtProvide(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index c2b892599..99c30c302 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -28,7 +28,8 @@ func (tp *provider) TestKey(t *testing.T) {
 }
 
 func (tp *provider) TestListSelf(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -61,7 +62,8 @@ func (tp *provider) TestListSelf(t *testing.T) {
 }
 
 func (tp *provider) TestRenameSelf(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -88,7 +90,8 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
 }
 
 func (tp *provider) TestRemoveSelf(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -106,7 +109,8 @@ func (tp *provider) TestRemoveSelf(t *testing.T) {
 }
 
 func (tp *provider) TestGenerate(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -128,7 +132,8 @@ func (tp *provider) TestGenerate(t *testing.T) {
 }
 
 func (tp *provider) TestGenerateSize(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -150,7 +155,8 @@ func (tp *provider) TestGenerateSize(t *testing.T) {
 }
 
 func (tp *provider) TestGenerateType(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	t.Skip("disabled until libp2p/specs#111 is fixed")
 
 	api, err := tp.makeAPI(ctx)
@@ -175,7 +181,8 @@ func (tp *provider) TestGenerateType(t *testing.T) {
 }
 
 func (tp *provider) TestGenerateExisting(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -207,7 +214,8 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
 }
 
 func (tp *provider) TestList(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -252,7 +260,8 @@ func (tp *provider) TestList(t *testing.T) {
 }
 
 func (tp *provider) TestRename(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -280,7 +289,8 @@ func (tp *provider) TestRename(t *testing.T) {
 }
 
 func (tp *provider) TestRenameToSelf(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -303,7 +313,8 @@ func (tp *provider) TestRenameToSelf(t *testing.T) {
 }
 
 func (tp *provider) TestRenameToSelfForce(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -326,7 +337,8 @@ func (tp *provider) TestRenameToSelfForce(t *testing.T) {
 }
 
 func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -355,7 +367,8 @@ func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
 }
 
 func (tp *provider) TestRenameOverwrite(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -393,7 +406,8 @@ func (tp *provider) TestRenameOverwrite(t *testing.T) {
 }
 
 func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -421,7 +435,8 @@ func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
 }
 
 func (tp *provider) TestRenameSameName(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -449,7 +464,8 @@ func (tp *provider) TestRenameSameName(t *testing.T) {
 }
 
 func (tp *provider) TestRemove(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index ecb06ddde..e114b26de 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -36,7 +36,8 @@ func appendPath(p coreiface.Path, sub string) coreiface.Path {
 }
 
 func (tp *provider) TestPublishResolve(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	init := func() (coreiface.CoreAPI, coreiface.Path) {
 		apis, err := tp.MakeAPISwarm(ctx, true, 5)
 		if err != nil {
@@ -185,7 +186,8 @@ func (tp *provider) TestPublishResolve(t *testing.T) {
 }
 
 func (tp *provider) TestBasicPublishResolveKey(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
@@ -228,7 +230,8 @@ func (tp *provider) TestBasicPublishResolveKey(t *testing.T) {
 func (tp *provider) TestBasicPublishResolveTimeout(t *testing.T) {
 	t.Skip("ValidTime doesn't appear to work at this time resolution")
 
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
 	if err != nil {
 		t.Fatal(err)
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 349b4a8f5..1cd24aac2 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -28,7 +28,8 @@ func (tp *provider) TestObject(t *testing.T) {
 }
 
 func (tp *provider) TestNew(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -54,7 +55,8 @@ func (tp *provider) TestNew(t *testing.T) {
 }
 
 func (tp *provider) TestObjectPut(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -94,7 +96,8 @@ func (tp *provider) TestObjectPut(t *testing.T) {
 }
 
 func (tp *provider) TestObjectGet(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -116,7 +119,8 @@ func (tp *provider) TestObjectGet(t *testing.T) {
 }
 
 func (tp *provider) TestObjectData(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -143,7 +147,8 @@ func (tp *provider) TestObjectData(t *testing.T) {
 }
 
 func (tp *provider) TestObjectLinks(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -178,7 +183,8 @@ func (tp *provider) TestObjectLinks(t *testing.T) {
 }
 
 func (tp *provider) TestObjectStat(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -225,7 +231,8 @@ func (tp *provider) TestObjectStat(t *testing.T) {
 }
 
 func (tp *provider) TestObjectAddLink(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -265,7 +272,8 @@ func (tp *provider) TestObjectAddLink(t *testing.T) {
 }
 
 func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -313,7 +321,8 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 }
 
 func (tp *provider) TestObjectRmLink(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -345,7 +354,8 @@ func (tp *provider) TestObjectRmLink(t *testing.T) {
 }
 
 func (tp *provider) TestObjectAddData(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -374,7 +384,8 @@ func (tp *provider) TestObjectAddData(t *testing.T) {
 }
 
 func (tp *provider) TestObjectSetData(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -403,7 +414,8 @@ func (tp *provider) TestObjectSetData(t *testing.T) {
 }
 
 func (tp *provider) TestDiffTest(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index cb1246366..e74053c04 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -18,7 +18,8 @@ func (tp *provider) TestPath(t *testing.T) {
 }
 
 func (tp *provider) TestMutablePath(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -45,7 +46,8 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 }
 
 func (tp *provider) TestPathRemainder(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -72,7 +74,8 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 }
 
 func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -103,7 +106,8 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 }
 
 func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -126,7 +130,8 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 }
 
 func (tp *provider) TestPathRoot(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 8c659ba35..823281ab1 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -15,7 +15,8 @@ func (tp *provider) TestPin(t *testing.T) {
 }
 
 func (tp *provider) TestPinAdd(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -33,7 +34,8 @@ func (tp *provider) TestPinAdd(t *testing.T) {
 }
 
 func (tp *provider) TestPinSimple(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -82,7 +84,8 @@ func (tp *provider) TestPinSimple(t *testing.T) {
 }
 
 func (tp *provider) TestPinRecursive(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index b31a55d4c..f411ad24d 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -79,7 +79,8 @@ func wrapped(name string) func(f files.Node) files.Node {
 }
 
 func (tp *provider) TestAdd(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -536,7 +537,8 @@ func (tp *provider) TestAdd(t *testing.T) {
 }
 
 func (tp *provider) TestAddPinned(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -558,7 +560,8 @@ func (tp *provider) TestAddPinned(t *testing.T) {
 }
 
 func (tp *provider) TestAddHashOnly(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -583,7 +586,8 @@ func (tp *provider) TestAddHashOnly(t *testing.T) {
 }
 
 func (tp *provider) TestGetEmptyFile(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -615,7 +619,8 @@ func (tp *provider) TestGetEmptyFile(t *testing.T) {
 }
 
 func (tp *provider) TestGetDir(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -647,7 +652,8 @@ func (tp *provider) TestGetDir(t *testing.T) {
 }
 
 func (tp *provider) TestGetNonUnixfs(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -666,7 +672,8 @@ func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 }
 
 func (tp *provider) TestLs(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -702,7 +709,8 @@ func (tp *provider) TestLs(t *testing.T) {
 }
 
 func (tp *provider) TestEntriesExpired(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -718,7 +726,7 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 		t.Error(err)
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
+	ctx, cancel = context.WithCancel(ctx)
 
 	nd, err := api.Unixfs().Get(ctx, p)
 	if err != nil {
@@ -745,7 +753,8 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 }
 
 func (tp *provider) TestLsEmptyDir(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -773,7 +782,8 @@ func (tp *provider) TestLsEmptyDir(t *testing.T) {
 
 // TODO(lgierth) this should test properly, with len(links) > 0
 func (tp *provider) TestLsNonUnixfs(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)
@@ -830,7 +840,8 @@ func (f *closeTestF) Close() error {
 }
 
 func (tp *provider) TestAddCloses(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
 		t.Error(err)

From f012ef096aa03a5815189dc04f7bb502cfe3e097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 2 Jan 2019 17:41:12 +0100
Subject: [PATCH 161/247] coreapi: don't panic as much in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@89157f98eeb09c4653c098eb4e438741cbdbd21a

This commit was moved from ipfs/boxo@27609c7a833ec02858ad16464eb40946f7ddeae3
---
 core/coreiface/tests/api.go   |  2 +-
 core/coreiface/tests/block.go | 12 ++++++------
 core/coreiface/tests/dag.go   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index ab1feff5b..23ec0612b 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -71,7 +71,7 @@ func TestApi(p Provider) func(t *testing.T) {
 			select {
 			case <-zeroRunning:
 			case <-time.After(time.Second):
-				t.Errorf("%d node(s) not closed", running)
+				t.Errorf("%d test swarms(s) not closed", running)
 			}
 		})
 	}
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index a3a5f93aa..d1117cc50 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -26,12 +26,12 @@ func (tp *provider) TestBlockPut(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if res.Path().Cid().String() != "QmPyo15ynbVrSTVdJL9th7JysHaAbXt9dM9tXk1bMHbRtk" {
@@ -49,7 +49,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("cbor"))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if res.Path().Cid().String() != "zdpuAn4amuLWo8Widi5v6VQpuo2dnpnwbVE3oB6qqs7mDSeoa" {
@@ -85,7 +85,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	r, err := api.Block().Get(ctx, res.Path())
@@ -126,7 +126,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	r, err := api.Block().Get(ctx, res.Path())
@@ -180,7 +180,7 @@ func (tp *provider) TestBlockStat(t *testing.T) {
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	stat, err := api.Block().Stat(ctx, res.Path())
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 636c38699..d50263943 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -40,7 +40,7 @@ func (tp *provider) TestPut(t *testing.T) {
 
 	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if res.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
@@ -58,7 +58,7 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 
 	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`), opt.Dag.Hash(mh.ID, -1))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if res.Cid().String() != "z5hRLNd2sv4z1c" {
@@ -76,12 +76,12 @@ func (tp *provider) TestDagPath(t *testing.T) {
 
 	sub, err := api.Dag().Put(ctx, strings.NewReader(`"foo"`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+sub.Cid().String()+`"}}`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p, err := coreiface.ParsePath(path.Join(res.Cid().String(), "lnk"))
@@ -109,7 +109,7 @@ func (tp *provider) TestTree(t *testing.T) {
 
 	c, err := api.Dag().Put(ctx, strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Dag().Get(ctx, c)
@@ -141,7 +141,7 @@ func (tp *provider) TestBatch(t *testing.T) {
 
 	c, err := batch.Put(ctx, strings.NewReader(`"Hello"`))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if c.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {

From 80aace0fa25dcc9d89aff8f3b767852c2935685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 4 Jan 2019 02:35:40 +0100
Subject: [PATCH 162/247] Fix offline gateway directory logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@360e8bbf0b798f4c52541d9116e3b2d240c71a9a

This commit was moved from ipfs/boxo@aecc5aa1ac7d14502faf74530e73fb801aed4158
---
 core/coreiface/path.go       |  9 +++++++--
 core/coreiface/tests/path.go | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 01dda97d5..96f30852d 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,8 @@
 package iface
 
 import (
+	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	ipfspath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
-
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
@@ -106,6 +105,12 @@ type resolvedPath struct {
 	remainder string
 }
 
+// Join appends provided segments to the base path
+func Join(base Path, a ...string) Path {
+	s := ipfspath.Join(append([]string{base.String()}, a...))
+	return &path{path: ipfspath.FromString(s)}
+}
+
 // IpfsPath creates new /ipfs path from the provided CID
 func IpfsPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index e74053c04..7057d6286 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -15,6 +15,7 @@ func (tp *provider) TestPath(t *testing.T) {
 	t.Run("TestEmptyPathRemainder", tp.TestEmptyPathRemainder)
 	t.Run("TestInvalidPathRemainder", tp.TestInvalidPathRemainder)
 	t.Run("TestPathRoot", tp.TestPathRoot)
+	t.Run("TestPathJoin", tp.TestPathJoin)
 }
 
 func (tp *provider) TestMutablePath(t *testing.T) {
@@ -165,3 +166,14 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Error("unexpected path cid")
 	}
 }
+
+func (tp *provider) TestPathJoin(t *testing.T) {
+	p1, err := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
+	if err != nil {
+		t.Error(err)
+	}
+
+	if coreiface.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
+		t.Error("unexpected path")
+	}
+}

From 3702f185fb7543de86260e52fb22b6a32add1bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 4 Jan 2019 15:40:15 +0100
Subject: [PATCH 163/247] coreapi: FetchBlocks option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@6800f56736680add20352d2348a59a1a41f7808e

This commit was moved from ipfs/boxo@030083beef42fd48df466a4a97ea0f51fb1dfbc6
---
 core/coreiface/options/global.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/global.go b/core/coreiface/options/global.go
index 93d635e41..90e2586f1 100644
--- a/core/coreiface/options/global.go
+++ b/core/coreiface/options/global.go
@@ -1,14 +1,16 @@
 package options
 
 type ApiSettings struct {
-	Offline bool
+	Offline     bool
+	FetchBlocks bool
 }
 
 type ApiOption func(*ApiSettings) error
 
 func ApiOptions(opts ...ApiOption) (*ApiSettings, error) {
 	options := &ApiSettings{
-		Offline: false,
+		Offline:     false,
+		FetchBlocks: true,
 	}
 
 	return ApiOptionsTo(options, opts...)
@@ -34,3 +36,12 @@ func (apiOpts) Offline(offline bool) ApiOption {
 		return nil
 	}
 }
+
+// FetchBlocks when set to false prevents api from fetching blocks from the
+// network while allowing other services such as IPNS to still be online
+func (apiOpts) FetchBlocks(fetch bool) ApiOption {
+	return func(settings *ApiSettings) error {
+		settings.FetchBlocks = fetch
+		return nil
+	}
+}

From dfd6253ba8498af122a35929870657e5a8b29744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 7 Jan 2019 16:19:55 +0100
Subject: [PATCH 164/247] CoreAPI: Don't panic when testing incomplete
 implementions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d7a89ddb0258cbc54631924688e6f23bc02709d5

This commit was moved from ipfs/boxo@9845df2662de30cb8d0030bd280e2b58247a0ef0
---
 core/coreiface/tests/api.go    | 16 +++++++++++++
 core/coreiface/tests/block.go  |  7 ++++++
 core/coreiface/tests/dag.go    |  7 ++++++
 core/coreiface/tests/dht.go    |  8 +++++++
 core/coreiface/tests/key.go    |  8 +++++++
 core/coreiface/tests/name.go   |  7 ++++++
 core/coreiface/tests/object.go |  7 ++++++
 core/coreiface/tests/path.go   | 44 ++++++++++++++++++++++++++--------
 core/coreiface/tests/pin.go    |  8 +++++++
 core/coreiface/tests/pubsub.go |  8 +++++++
 core/coreiface/tests/unixfs.go |  7 ++++++
 11 files changed, 117 insertions(+), 10 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 23ec0612b..7a4bd7386 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -2,12 +2,15 @@ package tests
 
 import (
 	"context"
+	"errors"
 	"testing"
 	"time"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 )
 
+var apiNotImplemented = errors.New("api not implemented")
+
 func (tp *provider) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
 	api, err := tp.MakeAPISwarm(ctx, false, 1)
 	if err != nil {
@@ -76,3 +79,16 @@ func TestApi(p Provider) func(t *testing.T) {
 		})
 	}
 }
+
+func (tp *provider) hasApi(t *testing.T, tf func(coreiface.CoreAPI) error) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := tf(api); err != nil {
+		t.Fatal(api)
+	}
+}
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index d1117cc50..81a6fb061 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -13,6 +13,13 @@ import (
 )
 
 func (tp *provider) TestBlock(t *testing.T) {
+	tp.hasApi(t, func(api coreiface.CoreAPI) error {
+		if api.Block() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestBlockPut", tp.TestBlockPut)
 	t.Run("TestBlockPutFormat", tp.TestBlockPutFormat)
 	t.Run("TestBlockPutHash", tp.TestBlockPutHash)
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index d50263943..70a45aa20 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -13,6 +13,13 @@ import (
 )
 
 func (tp *provider) TestDag(t *testing.T) {
+	tp.hasApi(t, func(api coreiface.CoreAPI) error {
+		if api.Dag() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestPut", tp.TestPut)
 	t.Run("TestPutWithHash", tp.TestPutWithHash)
 	t.Run("TestPath", tp.TestDagPath)
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 9b77f1679..3ec77d33b 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -5,10 +5,18 @@ import (
 	"io"
 	"testing"
 
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
 func (tp *provider) TestDht(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.Dht() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestDhtFindPeer", tp.TestDhtFindPeer)
 	t.Run("TestDhtFindProviders", tp.TestDhtFindProviders)
 	t.Run("TestDhtProvide", tp.TestDhtProvide)
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 99c30c302..8dd6af57f 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -5,10 +5,18 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 )
 
 func (tp *provider) TestKey(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.Key() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestListSelf", tp.TestListSelf)
 	t.Run("TestRenameSelf", tp.TestRenameSelf)
 	t.Run("TestRemoveSelf", tp.TestRemoveSelf)
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index e114b26de..639e72c3d 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -16,6 +16,13 @@ import (
 )
 
 func (tp *provider) TestName(t *testing.T) {
+	tp.hasApi(t, func(api coreiface.CoreAPI) error {
+		if api.Name() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestPublishResolve", tp.TestPublishResolve)
 	t.Run("TestBasicPublishResolveKey", tp.TestBasicPublishResolveKey)
 	t.Run("TestBasicPublishResolveTimeout", tp.TestBasicPublishResolveTimeout)
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 1cd24aac2..81d5b4117 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -13,6 +13,13 @@ import (
 )
 
 func (tp *provider) TestObject(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.Object() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestNew", tp.TestNew)
 	t.Run("TestObjectPut", tp.TestObjectPut)
 	t.Run("TestObjectGet", tp.TestObjectGet)
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 7057d6286..50a1977d5 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -26,7 +26,20 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	blk, err := api.Block().Put(ctx, strings.NewReader(`foo`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if blk.Path().Mutable() {
+		t.Error("expected /ipld path to be immutable")
+	}
+
 	// get self /ipns path
+	if api.Key() == nil {
+		t.Fatal(".Key not implemented")
+	}
+
 	keys, err := api.Key().List(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -35,15 +48,6 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 	if !keys[0].Path().Mutable() {
 		t.Error("expected self /ipns path to be mutable")
 	}
-
-	blk, err := api.Block().Put(ctx, strings.NewReader(`foo`))
-	if err != nil {
-		t.Error(err)
-	}
-
-	if blk.Path().Mutable() {
-		t.Error("expected /ipld path to be immutable")
-	}
 }
 
 func (tp *provider) TestPathRemainder(t *testing.T) {
@@ -54,6 +58,10 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if api.Dag() == nil {
+		t.Fatal(".Dag not implemented")
+	}
+
 	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
 	if err != nil {
 		t.Fatal(err)
@@ -82,6 +90,10 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if api.Dag() == nil {
+		t.Fatal(".Dag not implemented")
+	}
+
 	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
 	if err != nil {
 		t.Fatal(err)
@@ -114,6 +126,10 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if api.Dag() == nil {
+		t.Fatal(".Dag not implemented")
+	}
+
 	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
 	if err != nil {
 		t.Fatal(err)
@@ -138,9 +154,17 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if api.Block() == nil {
+		t.Fatal(".Block not implemented")
+	}
+
 	blk, err := api.Block().Put(ctx, strings.NewReader(`foo`), options.Block.Format("raw"))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
+	}
+
+	if api.Dag() == nil {
+		t.Fatal(".Dag not implemented")
 	}
 
 	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`))
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 823281ab1..87ad8a004 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -2,6 +2,7 @@ package tests
 
 import (
 	"context"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"strings"
 	"testing"
 
@@ -9,6 +10,13 @@ import (
 )
 
 func (tp *provider) TestPin(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.Pin() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestPinAdd", tp.TestPinAdd)
 	t.Run("TestPinSimple", tp.TestPinSimple)
 	t.Run("TestPinRecursive", tp.TestPinRecursive)
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index 3462b4755..b993f51dc 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -2,12 +2,20 @@ package tests
 
 import (
 	"context"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 	"testing"
 	"time"
 )
 
 func (tp *provider) TestPubSub(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.PubSub() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestBasicPubSub", tp.TestBasicPubSub)
 }
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index f411ad24d..ddb3145f7 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -24,6 +24,13 @@ import (
 )
 
 func (tp *provider) TestUnixfs(t *testing.T) {
+	tp.hasApi(t, func(api coreiface.CoreAPI) error {
+		if api.Unixfs() == nil {
+			return apiNotImplemented
+		}
+		return nil
+	})
+
 	t.Run("TestAdd", tp.TestAdd)
 	t.Run("TestAddPinned", tp.TestAddPinned)
 	t.Run("TestAddHashOnly", tp.TestAddHashOnly)

From 12b64d0d401e83617eae0e45590c7d8f96e89a48 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 8 Jan 2019 19:19:34 -0800
Subject: [PATCH 165/247] gx: update deps

Importantly:

* fixes a bunch of MFS bugs
* pulls in some bitswap improvements

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@e51dd550f4404781592f8d911ba822512039f304

This commit was moved from ipfs/boxo@551b466a611343bda0eb37d646ef753153919d2a
---
 core/coreiface/dht.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/swarm.go          | 6 +++---
 core/coreiface/tests/name.go     | 2 +-
 core/coreiface/tests/unixfs.go   | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index e39be92c5..ec8bd92c3 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	pstore "gx/ipfs/QmPiemjiKBC9VA7vZF82m4x1oygtg2c2YVqag8PX7dN1BD/go-libp2p-peerstore"
 	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
-	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index fd748bb4a..5f92f3eea 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
+	dag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 96f30852d..580703a73 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,8 +1,8 @@
 package iface
 
 import (
+	ipfspath "gx/ipfs/QmNYPETsdAu2uQ1k9q9S1jYEGURaLHV6cbYRSVFVRftpF8/go-path"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	ipfspath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 63d20f035..83e207282 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,10 +5,10 @@ import (
 	"errors"
 	"time"
 
-	net "gx/ipfs/QmPtFaR7BWHLAjSwLh9kXcyrgTzDpuhcWLkx8ioa9RMYnx/go-libp2p-net"
-	ma "gx/ipfs/QmRKLtwMw131aK7ugC3G7ybpumMz78YrJe5dzneyindvG1/go-multiaddr"
+	ma "gx/ipfs/QmNTCey11oxhb1AxDnQBRHtdhap6Ctud872NjAYPYYXPuc/go-multiaddr"
+	net "gx/ipfs/QmNgLg1NTw37iWbYPKcyK85YJ9Whs1MkPtJwhfqbNYAyKg/go-libp2p-net"
+	pstore "gx/ipfs/QmPiemjiKBC9VA7vZF82m4x1oygtg2c2YVqag8PX7dN1BD/go-libp2p-peerstore"
 	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
-	pstore "gx/ipfs/QmZ9zH2FnLcxv1xyzFeUpDUeo55xEhZQHgveZijcxr7TLj/go-libp2p-peerstore"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 )
 
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 639e72c3d..2e43a12ee 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
+	ipath "gx/ipfs/QmNYPETsdAu2uQ1k9q9S1jYEGURaLHV6cbYRSVFVRftpF8/go-path"
 	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
-	ipath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index ddb3145f7..e8a1aba32 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -15,11 +15,11 @@ import (
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
+	mdag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
 	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
-	"gx/ipfs/Qmbvw7kpSM2p6rbQ57WGRhhqNfCiNGW6EKH4xgHLw4bsnB/go-unixfs"
-	mdag "gx/ipfs/QmdV35UHnL1FM52baPkeUo6u7Fxm2CRUkPTLRPxeF8a4Ap/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 

From ba369e588d63c47bef4252593027cfe363ac54a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 12 Jan 2019 15:41:19 +0100
Subject: [PATCH 166/247] coreapi: replace coreiface.DagAPI with
 ipld.DAGService
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8e049b49d6e97f38c682aed4b2c18cdb557b3b84

This commit was moved from ipfs/boxo@30ccbef95ef833214b85ad077614b4b07b85c9f1
---
 core/coreiface/coreapi.go      |  2 +-
 core/coreiface/dag.go          | 41 ---------------
 core/coreiface/options/dag.go  | 95 ----------------------------------
 core/coreiface/tests/dag.go    | 93 +++++++++++++++++++++------------
 core/coreiface/tests/path.go   | 40 +++++++++-----
 core/coreiface/tests/pin.go    | 24 +++++----
 core/coreiface/tests/unixfs.go |  6 +--
 7 files changed, 107 insertions(+), 194 deletions(-)
 delete mode 100644 core/coreiface/dag.go
 delete mode 100644 core/coreiface/options/dag.go

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 226399967..9d2100fcc 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -19,7 +19,7 @@ type CoreAPI interface {
 	Block() BlockAPI
 
 	// Dag returns an implementation of Dag API
-	Dag() DagAPI
+	Dag() ipld.DAGService
 
 	// Name returns an implementation of Name API
 	Name() NameAPI
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
deleted file mode 100644
index eb9e2da4a..000000000
--- a/core/coreiface/dag.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package iface
-
-import (
-	"context"
-	"io"
-
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-
-	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
-)
-
-// DagOps groups operations that can be batched together
-type DagOps interface {
-	// Put inserts data using specified format and input encoding.
-	// Unless used with WithCodec or WithHash, the defaults "dag-cbor" and
-	// "sha256" are used.
-	Put(ctx context.Context, src io.Reader, opts ...options.DagPutOption) (ResolvedPath, error)
-}
-
-// DagBatch is the batching version of DagAPI. All implementations of DagBatch
-// should be threadsafe
-type DagBatch interface {
-	DagOps
-
-	// Commit commits nodes to the datastore and announces them to the network
-	Commit(ctx context.Context) error
-}
-
-// DagAPI specifies the interface to IPLD
-type DagAPI interface {
-	DagOps
-
-	// Get attempts to resolve and get the node specified by the path
-	Get(ctx context.Context, path Path) (ipld.Node, error)
-
-	// Tree returns list of paths within a node specified by the path.
-	Tree(ctx context.Context, path Path, opts ...options.DagTreeOption) ([]Path, error)
-
-	// Batch creates new DagBatch
-	Batch(ctx context.Context) DagBatch
-}
diff --git a/core/coreiface/options/dag.go b/core/coreiface/options/dag.go
deleted file mode 100644
index 9cccba585..000000000
--- a/core/coreiface/options/dag.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package options
-
-import (
-	"math"
-
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-)
-
-type DagPutSettings struct {
-	InputEnc string
-	Codec    uint64
-	MhType   uint64
-	MhLength int
-}
-
-type DagTreeSettings struct {
-	Depth int
-}
-
-type DagPutOption func(*DagPutSettings) error
-type DagTreeOption func(*DagTreeSettings) error
-
-func DagPutOptions(opts ...DagPutOption) (*DagPutSettings, error) {
-	options := &DagPutSettings{
-		InputEnc: "json",
-		Codec:    cid.DagCBOR,
-		MhType:   math.MaxUint64,
-		MhLength: -1,
-	}
-
-	for _, opt := range opts {
-		err := opt(options)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return options, nil
-}
-
-func DagTreeOptions(opts ...DagTreeOption) (*DagTreeSettings, error) {
-	options := &DagTreeSettings{
-		Depth: -1,
-	}
-
-	for _, opt := range opts {
-		err := opt(options)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return options, nil
-}
-
-type dagOpts struct{}
-
-var Dag dagOpts
-
-// InputEnc is an option for Dag.Put which specifies the input encoding of the
-// data. Default is "json", most formats/codecs support "raw"
-func (dagOpts) InputEnc(enc string) DagPutOption {
-	return func(settings *DagPutSettings) error {
-		settings.InputEnc = enc
-		return nil
-	}
-}
-
-// Codec is an option for Dag.Put which specifies the multicodec to use to
-// serialize the object. Default is cid.DagCBOR (0x71)
-func (dagOpts) Codec(codec uint64) DagPutOption {
-	return func(settings *DagPutSettings) error {
-		settings.Codec = codec
-		return nil
-	}
-}
-
-// Hash is an option for Dag.Put which specifies the multihash settings to use
-// when hashing the object. Default is based on the codec used
-// (mh.SHA2_256 (0x12) for DagCBOR). If mhLen is set to -1, default length for
-// the hash will be used
-func (dagOpts) Hash(mhType uint64, mhLen int) DagPutOption {
-	return func(settings *DagPutSettings) error {
-		settings.MhType = mhType
-		settings.MhLength = mhLen
-		return nil
-	}
-}
-
-// Depth is an option for Dag.Tree which specifies maximum depth of the
-// returned tree. Default is -1 (no depth limit)
-func (dagOpts) Depth(depth int) DagTreeOption {
-	return func(settings *DagTreeSettings) error {
-		settings.Depth = depth
-		return nil
-	}
-}
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 70a45aa20..e66106c33 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -2,12 +2,13 @@ package tests
 
 import (
 	"context"
+	"math"
 	"path"
 	"strings"
 	"testing"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coredag "github.com/ipfs/go-ipfs/core/coredag"
 
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
@@ -45,13 +46,18 @@ func (tp *provider) TestPut(t *testing.T) {
 		t.Error(err)
 	}
 
-	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Dag().Add(ctx, nds[0])
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if res.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
-		t.Errorf("got wrong cid: %s", res.Cid().String())
+	if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
 	}
 }
 
@@ -63,13 +69,18 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 		t.Error(err)
 	}
 
-	res, err := api.Dag().Put(ctx, strings.NewReader(`"Hello"`), opt.Dag.Hash(mh.ID, -1))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), mh.ID, -1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Dag().Add(ctx, nds[0])
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if res.Cid().String() != "z5hRLNd2sv4z1c" {
-		t.Errorf("got wrong cid: %s", res.Cid().String())
+	if nds[0].Cid().String() != "z5hRLNd2sv4z1c" {
+		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
 	}
 }
 
@@ -81,28 +92,43 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Error(err)
 	}
 
-	sub, err := api.Dag().Put(ctx, strings.NewReader(`"foo"`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	res, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+sub.Cid().String()+`"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	p, err := coreiface.ParsePath(path.Join(res.Cid().String(), "lnk"))
+	snds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"foo"`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	nd, err := api.Dag().Get(ctx, p)
+	err = api.Dag().Add(ctx, snds[0])
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+snds[0].Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if nd.Cid().String() != sub.Cid().String() {
-		t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), sub.Cid().String())
+	err = api.Dag().Add(ctx, nds[0])
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p, err := coreiface.ParsePath(path.Join(nds[0].Cid().String(), "lnk"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	rp, err := api.ResolvePath(ctx, p)
+	if err != nil {
+		t.Error(err)
+	}
+
+	nd, err := api.Dag().Get(ctx, rp.Cid())
+	if err != nil {
+		t.Error(err)
+	}
+
+	if nd.Cid().String() != snds[0].Cid().String() {
+		t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), snds[0].Cid().String())
 	}
 }
 
@@ -114,12 +140,17 @@ func (tp *provider) TestTree(t *testing.T) {
 		t.Error(err)
 	}
 
-	c, err := api.Dag().Put(ctx, strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = api.Dag().Add(ctx, nds[0])
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	res, err := api.Dag().Get(ctx, c)
+	res, err := api.Dag().Get(ctx, nds[0].Cid())
 	if err != nil {
 		t.Error(err)
 	}
@@ -144,27 +175,25 @@ func (tp *provider) TestBatch(t *testing.T) {
 		t.Error(err)
 	}
 
-	batch := api.Dag().Batch(ctx)
-
-	c, err := batch.Put(ctx, strings.NewReader(`"Hello"`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1)
 	if err != nil {
-		t.Fatal(err)
+		t.Error(err)
 	}
 
-	if c.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
-		t.Errorf("got wrong cid: %s", c.Cid().String())
+	if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
 	}
 
-	_, err = api.Dag().Get(ctx, c)
+	_, err = api.Dag().Get(ctx, nds[0].Cid())
 	if err == nil || err.Error() != "merkledag: not found" {
 		t.Error(err)
 	}
 
-	if err := batch.Commit(ctx); err != nil {
+	if err := api.Dag().AddMany(ctx, nds); err != nil {
 		t.Error(err)
 	}
 
-	_, err = api.Dag().Get(ctx, c)
+	_, err = api.Dag().Get(ctx, nds[0].Cid())
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 50a1977d5..01f2e6f36 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -2,11 +2,13 @@ package tests
 
 import (
 	"context"
+	"math"
 	"strings"
 	"testing"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/go-ipfs/core/coredag"
 )
 
 func (tp *provider) TestPath(t *testing.T) {
@@ -62,12 +64,16 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
+		t.Error(err)
+	}
+
+	if err := api.Dag().AddMany(ctx, nds); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(obj.String() + "/foo/bar")
+	p1, err := coreiface.ParsePath(nds[0].String() + "/foo/bar")
 	if err != nil {
 		t.Error(err)
 	}
@@ -94,16 +100,16 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
+		t.Error(err)
+	}
+
+	if err := api.Dag().AddMany(ctx, nds); err != nil {
 		t.Fatal(err)
 	}
 
-	if obj.Remainder() != "" {
-		t.Error("expected the resolved path to not have a remainder")
-	}
-
-	p1, err := coreiface.ParsePath(obj.String())
+	p1, err := coreiface.ParsePath(nds[0].Cid().String())
 	if err != nil {
 		t.Error(err)
 	}
@@ -130,12 +136,16 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"bar": "baz"}}`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
+		t.Error(err)
+	}
+
+	if err := api.Dag().AddMany(ctx, nds); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(obj.String() + "/bar/baz")
+	p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/bar/baz")
 	if err != nil {
 		t.Error(err)
 	}
@@ -167,12 +177,16 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	obj, err := api.Dag().Put(ctx, strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`))
+	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
+		t.Error(err)
+	}
+
+	if err := api.Dag().AddMany(ctx, nds); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(obj.String() + "/foo")
+	p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/foo")
 	if err != nil {
 		t.Error(err)
 	}
@@ -182,7 +196,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if rp.Root().String() != obj.Cid().String() {
+	if rp.Root().String() != nds[0].Cid().String() {
 		t.Error("unexpected path root")
 	}
 
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 87ad8a004..250799222 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -2,11 +2,13 @@ package tests
 
 import (
 	"context"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
+	"math"
 	"strings"
 	"testing"
 
+	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/go-ipfs/core/coredag"
 )
 
 func (tp *provider) TestPin(t *testing.T) {
@@ -109,22 +111,26 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Error(err)
 	}
 
-	p2, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`))
+	nd2, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	p3, err := api.Dag().Put(ctx, strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`))
+	nd3, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Pin().Add(ctx, p2)
+	if err := api.Dag().AddMany(ctx, append(nd2, nd3...)); err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, iface.IpldPath(nd2[0].Cid()))
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Pin().Add(ctx, p3, opt.Pin.Recursive(false))
+	err = api.Pin().Add(ctx, iface.IpldPath(nd3[0].Cid()), opt.Pin.Recursive(false))
 	if err != nil {
 		t.Error(err)
 	}
@@ -147,8 +153,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != p3.String() {
-		t.Error("unexpected path")
+	if list[0].Path().String() != iface.IpldPath(nd3[0].Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2[0].Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
@@ -160,8 +166,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != p2.String() {
-		t.Error("unexpected path")
+	if list[0].Path().String() != iface.IpldPath(nd2[0].Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3[0].Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index e8a1aba32..fce41ae84 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -633,7 +633,7 @@ func (tp *provider) TestGetDir(t *testing.T) {
 		t.Error(err)
 	}
 	edir := unixfs.EmptyDirNode()
-	_, err = api.Dag().Put(ctx, bytes.NewReader(edir.RawData()), options.Dag.Codec(cid.DagProtobuf), options.Dag.InputEnc("raw"))
+	err = api.Dag().Add(ctx, edir)
 	if err != nil {
 		t.Error(err)
 	}
@@ -667,7 +667,7 @@ func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 	}
 
 	nd := new(mdag.ProtoNode)
-	_, err = api.Dag().Put(ctx, bytes.NewReader(nd.RawData()), options.Dag.Codec(nd.CidBuilder().GetCodec()), options.Dag.InputEnc("raw"))
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Error(err)
 	}
@@ -801,7 +801,7 @@ func (tp *provider) TestLsNonUnixfs(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = api.Dag().Put(ctx, bytes.NewReader(nd.RawData()), options.Dag.Codec(cid.DagCBOR), options.Dag.InputEnc("raw"))
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Error(err)
 	}

From c1541fd86aa57b888199ad17018a99365ecd5af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 15 Jan 2019 18:51:29 +0100
Subject: [PATCH 167/247] coreapi: adjust some tests for go-ipfs-http-api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@fb15570caa8ff7cb9defce24198738273b23aa16

This commit was moved from ipfs/boxo@6d44270b3a49474f67a51f0fcddfbf40766363be
---
 core/coreiface/tests/block.go  |  4 ++--
 core/coreiface/tests/dht.go    | 20 ++++++++++++++++++--
 core/coreiface/tests/key.go    | 16 ++++++++--------
 core/coreiface/tests/object.go |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 81a6fb061..427ad3357 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -159,7 +159,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 	if err == nil {
 		t.Error("expected err to exist")
 	}
-	if err.Error() != "blockservice: key not found" {
+	if !strings.Contains(err.Error(), "blockservice: key not found") {
 		t.Errorf("unexpected error; %s", err.Error())
 	}
 
@@ -167,7 +167,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 	if err == nil {
 		t.Error("expected err to exist")
 	}
-	if err.Error() != "blockstore: block not found" {
+	if !strings.Contains(err.Error(), "blockstore: block not found") {
 		t.Errorf("unexpected error; %s", err.Error())
 	}
 
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 3ec77d33b..d2eae1af4 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -35,12 +35,20 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	laddrs0, err := apis[0].Swarm().LocalAddrs(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(laddrs0) != 1 {
+		t.Fatal("unexpected number of local addrs")
+	}
+
 	pi, err := apis[2].Dht().FindPeer(ctx, self0.ID())
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if pi.Addrs[0].String() != "/ip4/127.0.0.1/tcp/4001" {
+	if pi.Addrs[0].String() != laddrs0[0].String() {
 		t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
 	}
 
@@ -54,7 +62,15 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if pi.Addrs[0].String() != "/ip4/127.0.2.1/tcp/4001" {
+	laddrs2, err := apis[2].Swarm().LocalAddrs(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(laddrs2) != 1 {
+		t.Fatal("unexpected number of local addrs")
+	}
+
+	if pi.Addrs[0].String() != laddrs2[0].String() {
 		t.Errorf("got unexpected address from FindPeer: %s", pi.Addrs[0].String())
 	}
 }
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 8dd6af57f..66011f99f 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -82,7 +82,7 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot rename key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot rename key with name 'self'") {
 			t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -91,7 +91,7 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot rename key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot rename key with name 'self'") {
 			t.Fatalf("expected error 'cannot rename key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -110,7 +110,7 @@ func (tp *provider) TestRemoveSelf(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot remove key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot remove key with name 'self'") {
 			t.Fatalf("expected error 'cannot remove key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -206,7 +206,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "key with name 'foo' already exists" {
+		if !strings.Contains(err.Error(), "key with name 'foo' already exists") {
 			t.Fatalf("expected error 'key with name 'foo' already exists', got '%s'", err.Error())
 		}
 	}
@@ -215,7 +215,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot create key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot create key with name 'self'") {
 			t.Fatalf("expected error 'cannot create key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -314,7 +314,7 @@ func (tp *provider) TestRenameToSelf(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot overwrite key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot overwrite key with name 'self'") {
 			t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -338,7 +338,7 @@ func (tp *provider) TestRenameToSelfForce(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "cannot overwrite key with name 'self'" {
+		if !strings.Contains(err.Error(), "cannot overwrite key with name 'self'") {
 			t.Fatalf("expected error 'cannot overwrite key with name 'self'', got '%s'", err.Error())
 		}
 	}
@@ -368,7 +368,7 @@ func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
 	if err == nil {
 		t.Error("expected error to not be nil")
 	} else {
-		if err.Error() != "key by that name already exists, refusing to overwrite" {
+		if !strings.Contains(err.Error(), "key by that name already exists, refusing to overwrite") {
 			t.Fatalf("expected error 'key by that name already exists, refusing to overwrite', got '%s'", err.Error())
 		}
 	}
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 81d5b4117..2a3b1bd5c 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -300,7 +300,7 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected an error")
 	}
-	if err.Error() != "no link by that name" {
+	if !strings.Contains(err.Error(), "no link by that name") {
 		t.Fatalf("unexpected error: %s", err.Error())
 	}
 

From f2b47a6665c0ef780d1329b85cb251f8e368ae99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 11 Jan 2019 12:49:50 +0100
Subject: [PATCH 168/247] ls: report real size by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d48b9e1c1f2c70766f5fd1cb13f872ec86075d4d

This commit was moved from ipfs/boxo@b1caa58eae01f9d6623c504be4085c32ebc675f5
---
 core/coreiface/tests/unixfs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index e8a1aba32..9e1454c41 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -704,8 +704,8 @@ func (tp *provider) TestLs(t *testing.T) {
 	if len(links) != 1 {
 		t.Fatalf("expected 1 link, got %d", len(links))
 	}
-	if links[0].Size != 23 {
-		t.Fatalf("expected size = 23, got %d", links[0].Size)
+	if links[0].Size != 15 {
+		t.Fatalf("expected size = 15, got %d", links[0].Size)
 	}
 	if links[0].Name != "name-of-file" {
 		t.Fatalf("expected name = name-of-file, got %s", links[0].Name)

From dbeaf11b3970d6597b0b013712eda5b73b52242b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 11 Jan 2019 13:16:47 +0100
Subject: [PATCH 169/247] ls: skip size for directories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@6c323ff16d39002eec98b8ae6337f7050937e0d8

This commit was moved from ipfs/boxo@100779d936550209ee7020525cb7b3ff0639787f
---
 core/coreiface/tests/unixfs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 9e1454c41..e8a1aba32 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -704,8 +704,8 @@ func (tp *provider) TestLs(t *testing.T) {
 	if len(links) != 1 {
 		t.Fatalf("expected 1 link, got %d", len(links))
 	}
-	if links[0].Size != 15 {
-		t.Fatalf("expected size = 15, got %d", links[0].Size)
+	if links[0].Size != 23 {
+		t.Fatalf("expected size = 23, got %d", links[0].Size)
 	}
 	if links[0].Name != "name-of-file" {
 		t.Fatalf("expected name = name-of-file, got %s", links[0].Name)

From 20eafc59a59e7a5fc86f98603ad90b59450d1810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 21 Jan 2019 21:31:52 +0100
Subject: [PATCH 170/247] coreapi: few more error check fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@b4e7753bacca7684d5e70294f766948fd77bf1c7

This commit was moved from ipfs/boxo@b92dcf5817ba9154db34f6156ad70836b7669b03
---
 core/coreiface/tests/dag.go    | 2 +-
 core/coreiface/tests/path.go   | 2 +-
 core/coreiface/tests/unixfs.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index e66106c33..10fab125a 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -185,7 +185,7 @@ func (tp *provider) TestBatch(t *testing.T) {
 	}
 
 	_, err = api.Dag().Get(ctx, nds[0].Cid())
-	if err == nil || err.Error() != "merkledag: not found" {
+	if err == nil || !strings.Contains(err.Error(), "not found") {
 		t.Error(err)
 	}
 
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 01f2e6f36..e7df6f1fb 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -151,7 +151,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 	}
 
 	_, err = api.ResolvePath(ctx, p1)
-	if err == nil || err.Error() != "no such link found" {
+	if err == nil || !strings.Contains(err.Error(), "no such link found") {
 		t.Fatalf("unexpected error: %s", err)
 	}
 }
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index fce41ae84..0ef3f031e 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -587,7 +587,7 @@ func (tp *provider) TestAddHashOnly(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected an error")
 	}
-	if err.Error() != "blockservice: key not found" {
+	if !strings.Contains(err.Error(), "blockservice: key not found") {
 		t.Errorf("unxepected error: %s", err.Error())
 	}
 }

From 75fce9a3291127ed14cee84d4de50c2b0e3d9c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 22 Jan 2019 21:01:19 +0100
Subject: [PATCH 171/247] Port dag commansds to CoreAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@f40d44ddbfd929eb84316d66e895f93dedf47424

This commit was moved from ipfs/boxo@9eb0432c770d33d2b1c15ea25e5d3974654e843f
---
 core/coreiface/coreapi.go |  2 +-
 core/coreiface/dag.go     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 core/coreiface/dag.go

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 9d2100fcc..16b28182e 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -19,7 +19,7 @@ type CoreAPI interface {
 	Block() BlockAPI
 
 	// Dag returns an implementation of Dag API
-	Dag() ipld.DAGService
+	Dag() APIDagService
 
 	// Name returns an implementation of Name API
 	Name() NameAPI
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
new file mode 100644
index 000000000..455d00450
--- /dev/null
+++ b/core/coreiface/dag.go
@@ -0,0 +1,13 @@
+package iface
+
+import (
+	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
+)
+
+// APIDagService extends ipld.DAGService
+type APIDagService interface {
+	ipld.DAGService
+
+	// Pinning returns special NodeAdder which recursively pins added nodes
+	Pinning() ipld.NodeAdder
+}

From a437ea3e4e7ccf705adb78a7203fb9856861b7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 14 Jan 2019 21:01:39 +0100
Subject: [PATCH 172/247] Unixfs.Add nocopy test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e49c3d2211a09a5bfa5c5eceeeaf08715b230313

This commit was moved from ipfs/boxo@f542e9c788b6601c072ec7408e73a9057921a0b2
---
 core/coreiface/tests/unixfs.go | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 0ef3f031e..0ceae06e1 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -101,6 +101,34 @@ func (tp *provider) TestAdd(t *testing.T) {
 		return coreiface.IpfsPath(c)
 	}
 
+	rf, err := ioutil.TempFile(os.TempDir(), "unixfs-add-real")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rfp := rf.Name()
+
+	if _, err := rf.Write([]byte(helloStr)); err != nil {
+		t.Fatal(err)
+	}
+
+	stat, err := rf.Stat()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := rf.Close(); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(rfp)
+
+	realFile := func() files.Node {
+		n, err := files.NewReaderPathFile(rfp, ioutil.NopCloser(strings.NewReader(helloStr)), stat)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return n
+	}
+
 	cases := []struct {
 		name   string
 		data   func() files.Node
@@ -323,6 +351,20 @@ func (tp *provider) TestAdd(t *testing.T) {
 			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
 			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
 		},
+		// NoCopy
+		{
+			name: "simpleNoCopy",
+			data: realFile,
+			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
+		},
+		{
+			name: "noCopyNoRaw",
+			data: realFile,
+			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
+			err:  "nocopy option requires '--raw-leaves' to be enabled as well",
+		},
 		// Events / Progress
 		{
 			name: "simpleAddEvent",

From f590838d14beed45d05b5db680eb4d010470123d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 14 Jan 2019 22:00:57 +0100
Subject: [PATCH 173/247] Unixfs: enforce refs on files when using nocopy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3de10ba1bd3faefa63d1c9353a7ac47c5de45d2d

This commit was moved from ipfs/boxo@089430e39729baec439315f08826de38643a99fb
---
 core/coreiface/tests/unixfs.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 0ceae06e1..fdc1a08cd 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs"
+	"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs/importer/helpers"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
 	mdag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
@@ -365,6 +366,13 @@ func (tp *provider) TestAdd(t *testing.T) {
 			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
 			err:  "nocopy option requires '--raw-leaves' to be enabled as well",
 		},
+		{
+			name: "noCopyNoPath",
+			data: strFile(helloStr),
+			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
+			err:  helpers.ErrMissingFsRef.Error(),
+		},
 		// Events / Progress
 		{
 			name: "simpleAddEvent",

From d40a54caaf9cfee2f0efb3412c3eb6094e838c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 14 Jan 2019 22:05:10 +0100
Subject: [PATCH 174/247] gx: update go-unixfs to 1.2.14 and go-bitswap to
 1.1.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(and everything else...)

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3cc6578657ac8580d77f93a681f80ceeba1d6389

This commit was moved from ipfs/boxo@99fe5e7502f9c05b67e338490b47816d4434aa71
---
 core/coreiface/coreapi.go        | 2 +-
 core/coreiface/dag.go            | 2 +-
 core/coreiface/object.go         | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/tests/name.go     | 2 +-
 core/coreiface/tests/unixfs.go   | 8 ++++----
 core/coreiface/unixfs.go         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 16b28182e..d26ec4f7d 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index 455d00450..d15e24360 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 )
 
 // APIDagService extends ipld.DAGService
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index ba6f5a95d..2ed357cb6 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -7,7 +7,7 @@ import (
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 5f92f3eea..109a63f1d 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
+	dag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 580703a73..b96e0e775 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,8 +1,8 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmNYPETsdAu2uQ1k9q9S1jYEGURaLHV6cbYRSVFVRftpF8/go-path"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	ipfspath "gx/ipfs/QmWqh9oob7ZHQRwU5CdTqpnC8ip8BEkFNrwXRxeNo5Y7vA/go-path"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 2e43a12ee..7b0a5d8f0 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	ipath "gx/ipfs/QmNYPETsdAu2uQ1k9q9S1jYEGURaLHV6cbYRSVFVRftpF8/go-path"
+	ipath "gx/ipfs/QmWqh9oob7ZHQRwU5CdTqpnC8ip8BEkFNrwXRxeNo5Y7vA/go-path"
 	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index fdc1a08cd..6f10406eb 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -15,12 +15,12 @@ import (
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs"
-	"gx/ipfs/QmQXze9tG878pa4Euya4rrDpyTNX3kQe4dhCaBzBozGgpe/go-unixfs/importer/helpers"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	cbor "gx/ipfs/QmRoARq3nkUb13HSKZGepCZSWe5GrVPwx7xURJGZ7KWv9V/go-ipld-cbor"
-	mdag "gx/ipfs/QmTQdH4848iTVCJmKXYyRiK72HufWTLYQQ8iN3JaQ8K1Hq/go-merkledag"
+	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+	"gx/ipfs/QmSMJ4rZbCJaih3y82Ebq7BZqK6vU2FHsKcWKQiE1DPTpS/go-unixfs"
+	"gx/ipfs/QmSMJ4rZbCJaih3y82Ebq7BZqK6vU2FHsKcWKQiE1DPTpS/go-unixfs/importer/helpers"
 	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	mdag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index b42b454cc..3c2788196 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
-	ipld "gx/ipfs/QmcKKBwfz6FyQdHR2jsXrrF6XeSBXYL86anmWNewpFpoF5/go-ipld-format"
 )
 
 type AddEvent struct {

From 0f40b6847509dd7a52c54d9931dc9230e39ed4f3 Mon Sep 17 00:00:00 2001
From: Overbool <overbool.xu@gmail.com>
Date: Thu, 13 Dec 2018 23:02:55 +0800
Subject: [PATCH 175/247] cmds/pin: use coreapi/pin

License: MIT
Signed-off-by: Overbool <overbool.xu@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3e1cd71bb97f70a6309fa31f3d9e719c7b38f254

This commit was moved from ipfs/boxo@6b2d6ab3cdddb3db4b653e82ac78560e2c1b842f
---
 core/coreiface/options/pin.go | 36 ++++++++++++++++++++++++++++++++++-
 core/coreiface/pin.go         |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 9d1107f92..630b561de 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -8,12 +8,23 @@ type PinLsSettings struct {
 	Type string
 }
 
+// PinRmSettings represents the settings of pin rm command
+type PinRmSettings struct {
+	Recursive bool
+	Force     bool
+}
+
 type PinUpdateSettings struct {
 	Unpin bool
 }
 
 type PinAddOption func(*PinAddSettings) error
-type PinLsOption func(settings *PinLsSettings) error
+
+// PinRmOption pin rm option func
+type PinRmOption func(*PinRmSettings) error
+
+// PinLsOption pin ls option func
+type PinLsOption func(*PinLsSettings) error
 type PinUpdateOption func(*PinUpdateSettings) error
 
 func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
@@ -31,6 +42,21 @@ func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
 	return options, nil
 }
 
+// PinRmOptions pin rm options
+func PinRmOptions(opts ...PinRmOption) (*PinRmSettings, error) {
+	options := &PinRmSettings{
+		Recursive: true,
+	}
+
+	for _, opt := range opts {
+		if err := opt(options); err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
 func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
 	options := &PinLsSettings{
 		Type: "all",
@@ -102,6 +128,14 @@ func (pinOpts) Recursive(recursive bool) PinAddOption {
 	}
 }
 
+// RmRecursive is an option for Pin.Rm
+func (pinOpts) RmRecursive(recursive bool) PinRmOption {
+	return func(settings *PinRmSettings) error {
+		settings.Recursive = recursive
+		return nil
+	}
+}
+
 // Type is an option for Pin.Ls which allows to specify which pin types should
 // be returned
 //
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 2e119cbea..6e13def8f 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -43,7 +43,7 @@ type PinAPI interface {
 	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
 
 	// Rm removes pin for object specified by the path
-	Rm(context.Context, Path) error
+	Rm(context.Context, Path, ...options.PinRmOption) error
 
 	// Update changes one pin to another, skipping checks for matching paths in
 	// the old tree

From bcc6216709b9f782931d640abeaa7f14563f5d06 Mon Sep 17 00:00:00 2001
From: Overbool <overbool.xu@gmail.com>
Date: Sat, 15 Dec 2018 11:14:29 +0800
Subject: [PATCH 176/247] cmds/pin: modify test

License: MIT
Signed-off-by: Overbool <overbool.xu@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8e9e8d1b419aa93da6f3573bf424db57a60399ae

This commit was moved from ipfs/boxo@e3960a2b9f8f40403f8ffbce29e576a217dbbf74
---
 core/coreiface/options/pin.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 630b561de..cc4a8ef29 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -11,7 +11,6 @@ type PinLsSettings struct {
 // PinRmSettings represents the settings of pin rm command
 type PinRmSettings struct {
 	Recursive bool
-	Force     bool
 }
 
 type PinUpdateSettings struct {

From e00e0dfed2c142410b5878783818ba29569acad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 30 Jan 2019 17:42:14 +0100
Subject: [PATCH 177/247] gx: update go-unixfs to propagate archive changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@fbde8e2781a69d29530a3a55c8007f135d65e25e

This commit was moved from ipfs/boxo@c6503a1ba9fa4f111fd0ca2975a9f7285d5d4768
---
 core/coreiface/tests/name.go   | 2 +-
 core/coreiface/tests/unixfs.go | 6 +++---
 core/coreiface/unixfs.go       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 7b0a5d8f0..8690f22c3 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	ipath "gx/ipfs/QmWqh9oob7ZHQRwU5CdTqpnC8ip8BEkFNrwXRxeNo5Y7vA/go-path"
-	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 6f10406eb..2f1ab90a4 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -15,11 +15,11 @@ import (
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
+	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs/importer/helpers"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
-	"gx/ipfs/QmSMJ4rZbCJaih3y82Ebq7BZqK6vU2FHsKcWKQiE1DPTpS/go-unixfs"
-	"gx/ipfs/QmSMJ4rZbCJaih3y82Ebq7BZqK6vU2FHsKcWKQiE1DPTpS/go-unixfs/importer/helpers"
-	"gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 	mdag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 3c2788196..408280cbc 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -6,7 +6,7 @@ import (
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
-	files "gx/ipfs/QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX/go-ipfs-files"
+	files "gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 )
 
 type AddEvent struct {

From 8f0b53d1f78c8eb7c2977416ba492ad6c21be47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 21 Jan 2019 12:30:34 +0100
Subject: [PATCH 178/247] coreapi: add some seeker tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@be8e8d1aebcd3b544b0b9c345338ed9c55bbfe1c

This commit was moved from ipfs/boxo@ac20c6ad8101683bb28e0a57955bcefc454a959f
---
 core/coreiface/tests/unixfs.go | 107 ++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 2f1ab90a4..5ae273987 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -3,9 +3,11 @@ package tests
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"math"
+	"math/rand"
 	"os"
 	"strconv"
 	"strings"
@@ -43,6 +45,7 @@ func (tp *provider) TestUnixfs(t *testing.T) {
 	t.Run("TestLsEmptyDir", tp.TestLsEmptyDir)
 	t.Run("TestLsNonUnixfs", tp.TestLsNonUnixfs)
 	t.Run("TestAddCloses", tp.TestAddCloses)
+	t.Run("TestGetSeek", tp.TestGetSeek)
 }
 
 // `echo -n 'hello, world!' | ipfs add`
@@ -934,5 +937,107 @@ func (tp *provider) TestAddCloses(t *testing.T) {
 			t.Errorf("dir %d not closed!", i)
 		}
 	}
-
+}
+
+func (tp *provider) TestGetSeek(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	dataSize := int64(100000)
+	tf := files.NewReaderFile(io.LimitReader(rand.New(rand.NewSource(1403768328)), dataSize))
+
+	p, err := api.Unixfs().Add(ctx, tf, options.Unixfs.Chunker("size-100"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Unixfs().Get(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	f := files.ToFile(r)
+	if f == nil {
+		t.Fatal("not a file")
+	}
+
+	orig := make([]byte, dataSize)
+	if _, err := f.Read(orig); err != nil {
+		t.Fatal(err)
+	}
+	f.Close()
+
+	origR := bytes.NewReader(orig)
+
+	r, err = api.Unixfs().Get(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	f = files.ToFile(r)
+	if f == nil {
+		t.Fatal("not a file")
+	}
+
+	test := func(offset int64, whence int, read int, expect int64, shouldEof bool) {
+		t.Run(fmt.Sprintf("seek%d+%d-r%d-%d", whence, offset, read, expect), func(t *testing.T) {
+			n, err := f.Seek(offset, whence)
+			if err != nil {
+				t.Fatal(err)
+			}
+			origN, err := origR.Seek(offset, whence)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if n != origN {
+				t.Fatalf("offsets didn't match, expected %d, got %d", origN, n)
+			}
+
+			buf := make([]byte, read)
+			origBuf := make([]byte, read)
+			origRead, err := origR.Read(origBuf)
+			if err != nil {
+				t.Fatalf("orig: %s", err)
+			}
+			r, err := f.Read(buf)
+			switch {
+			case shouldEof && err != nil && err != io.EOF:
+				fallthrough
+			case !shouldEof && err != nil:
+				t.Fatalf("f: %s", err)
+			case shouldEof:
+				_, err := f.Read([]byte{0})
+				if err != io.EOF {
+					t.Fatal("expected EOF")
+				}
+				_, err = origR.Read([]byte{0})
+				if err != io.EOF {
+					t.Fatal("expected EOF (orig)")
+				}
+			}
+
+			if int64(r) != expect {
+				t.Fatal("read wrong amount of data")
+			}
+			if r != origRead {
+				t.Fatal("read different amount of data than bytes.Reader")
+			}
+			if !bytes.Equal(buf, origBuf) {
+				t.Fatal("data didn't match")
+			}
+		})
+	}
+
+	test(3, io.SeekCurrent, 10, 10, false)
+	test(3, io.SeekCurrent, 10, 10, false)
+	test(500, io.SeekCurrent, 10, 10, false)
+	test(350, io.SeekStart, 100, 100, false)
+	test(-123, io.SeekCurrent, 100, 100, false)
+	test(dataSize-50, io.SeekStart, 100, 50, true)
+	test(-5, io.SeekEnd, 100, 5, true)
 }

From aeb9cdfae0878d4954ecc2cdc570168449887463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 1 Feb 2019 19:48:43 +0100
Subject: [PATCH 179/247] coreapi: use chan for returning results in Unixfs.Ls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@93175e9900f58425d3868381c3a8668500ac39a9

This commit was moved from ipfs/boxo@3afaf889d4d49000482655a90591acdd3eb16349
---
 core/coreiface/tests/unixfs.go | 18 ++++++++++--------
 core/coreiface/unixfs.go       |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 5ae273987..68d408e6c 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -754,18 +754,20 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Error(err)
 	}
 
-	if len(links) != 1 {
-		t.Fatalf("expected 1 link, got %d", len(links))
+	link := <- links
+	if link.Size != 23 {
+		t.Fatalf("expected size = 23, got %d", link.Size)
 	}
-	if links[0].Size != 23 {
-		t.Fatalf("expected size = 23, got %d", links[0].Size)
+	if link.Name != "name-of-file" {
+		t.Fatalf("expected name = name-of-file, got %s", link.Name)
 	}
-	if links[0].Name != "name-of-file" {
-		t.Fatalf("expected name = name-of-file, got %s", links[0].Name)
+	if link.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
+		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", link.Cid)
 	}
-	if links[0].Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
-		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", links[0].Cid)
+	if _, ok := <-links; ok {
+		t.Errorf("didn't expect a second link")
 	}
+
 }
 
 func (tp *provider) TestEntriesExpired(t *testing.T) {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 408280cbc..cdb6a1e0c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -31,5 +31,5 @@ type UnixfsAPI interface {
 	Get(context.Context, Path) (files.Node, error)
 
 	// Ls returns the list of links in a directory
-	Ls(context.Context, Path) ([]*ipld.Link, error)
+	Ls(context.Context, Path) (<-chan *ipld.Link, error)
 }

From 9f4c14741c76ab5c65de43a7871bbb24609b72d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 1 Feb 2019 20:12:48 +0100
Subject: [PATCH 180/247] coreapi: asunc ls option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@72006bfe2d78cd6cb507ff0265cd1844521d190e

This commit was moved from ipfs/boxo@db66d03977366d25aa6b91f30a6ec7a9fcae9037
---
 core/coreiface/options/unixfs.go | 30 ++++++++++++++++++++++++++++++
 core/coreiface/tests/unixfs.go   | 22 ++++++++++++++++++++--
 core/coreiface/unixfs.go         |  6 +++---
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 109a63f1d..819cc3b6b 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -42,7 +42,12 @@ type UnixfsAddSettings struct {
 	Progress bool
 }
 
+type UnixfsLsSettings struct {
+	Async bool
+}
+
 type UnixfsAddOption func(*UnixfsAddSettings) error
+type UnixfsLsOption func(*UnixfsLsSettings) error
 
 func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix, error) {
 	options := &UnixfsAddSettings{
@@ -122,6 +127,21 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 	return options, prefix, nil
 }
 
+func UnixfsLsOptions(opts ...UnixfsLsOption) (*UnixfsLsSettings, error) {
+	options := &UnixfsLsSettings{
+		Async: true,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
 type unixfsOpts struct{}
 
 var Unixfs unixfsOpts
@@ -290,3 +310,13 @@ func (unixfsOpts) Nocopy(enable bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Async tells ls to return results as soon as they are available, which can be
+// useful for listing HAMT directories. When this option is set to true returned
+// results won't be returned in order
+func (unixfsOpts) Async(async bool) UnixfsLsOption {
+	return func(settings *UnixfsLsSettings) error {
+		settings.Async = async
+		return nil
+	}
+}
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 68d408e6c..b2b5a9ebb 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -749,12 +749,12 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Error(err)
 	}
 
-	links, err := api.Unixfs().Ls(ctx, p)
+	links, err := api.Unixfs().Ls(ctx, p, options.Unixfs.Async(false))
 	if err != nil {
 		t.Error(err)
 	}
 
-	link := <- links
+	link := (<-links).Link
 	if link.Size != 23 {
 		t.Fatalf("expected size = 23, got %d", link.Size)
 	}
@@ -768,6 +768,24 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Errorf("didn't expect a second link")
 	}
 
+	links, err = api.Unixfs().Ls(ctx, p, options.Unixfs.Async(true))
+	if err != nil {
+		t.Error(err)
+	}
+
+	link = (<-links).Link
+	if link.Size != 23 {
+		t.Fatalf("expected size = 23, got %d", link.Size)
+	}
+	if link.Name != "name-of-file" {
+		t.Fatalf("expected name = name-of-file, got %s", link.Name)
+	}
+	if link.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
+		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", link.Cid)
+	}
+	if _, ok := <-links; ok {
+		t.Errorf("didn't expect a second link")
+	}
 }
 
 func (tp *provider) TestEntriesExpired(t *testing.T) {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index cdb6a1e0c..ba2673fee 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
-	files "gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
+	ft "gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
+	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 )
 
 type AddEvent struct {
@@ -31,5 +31,5 @@ type UnixfsAPI interface {
 	Get(context.Context, Path) (files.Node, error)
 
 	// Ls returns the list of links in a directory
-	Ls(context.Context, Path) (<-chan *ipld.Link, error)
+	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan ft.LinkResult, error)
 }

From ef5879661a0feb801ce0463548ca60cf06c9d3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 1 Feb 2019 23:07:19 +0100
Subject: [PATCH 181/247] coreapi: resolve type/size in Unixfs.Ls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@01bbf29cf470532d94aba2bc5a912eb44d9997d0

This commit was moved from ipfs/boxo@54f7855257d69f5f79fe37d7896ddff4e0d1c2f7
---
 core/coreiface/options/unixfs.go | 17 +++++++++++++++++
 core/coreiface/unixfs.go         | 14 +++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 819cc3b6b..6dbab93b6 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -44,6 +44,9 @@ type UnixfsAddSettings struct {
 
 type UnixfsLsSettings struct {
 	Async bool
+
+	ResolveType bool
+	ResolveSize bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -320,3 +323,17 @@ func (unixfsOpts) Async(async bool) UnixfsLsOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) ResolveSize(resolve bool) UnixfsLsOption {
+	return func(settings *UnixfsLsSettings) error {
+		settings.ResolveSize = resolve
+		return nil
+	}
+}
+
+func (unixfsOpts) ResolveType(resolve bool) UnixfsLsOption {
+	return func(settings *UnixfsLsSettings) error {
+		settings.ResolveSize = resolve
+		return nil
+	}
+}
\ No newline at end of file
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index ba2673fee..846b74629 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,10 +2,10 @@ package iface
 
 import (
 	"context"
-
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	ft "gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
+	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs/pb"
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 )
 
@@ -16,6 +16,14 @@ type AddEvent struct {
 	Size  string       `json:",omitempty"`
 }
 
+type LsLink struct {
+	Link *ipld.Link
+	Size uint64
+	Type unixfs_pb.Data_DataType
+
+	Err error
+}
+
 // UnixfsAPI is the basic interface to immutable files in IPFS
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
@@ -31,5 +39,5 @@ type UnixfsAPI interface {
 	Get(context.Context, Path) (files.Node, error)
 
 	// Ls returns the list of links in a directory
-	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan ft.LinkResult, error)
+	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan LsLink, error)
 }

From 3dab84314914893061a215ef9cc56f154f9a343c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 2 Feb 2019 00:18:44 +0100
Subject: [PATCH 182/247] ls: use CoreAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@fad4bd392abb9eb689687497d89d9e51e56486fb

This commit was moved from ipfs/boxo@966d0008c10b29c04075261e3c59b0cab8953faa
---
 core/coreiface/options/unixfs.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6dbab93b6..4ff5cdb3f 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -133,6 +133,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 func UnixfsLsOptions(opts ...UnixfsLsOption) (*UnixfsLsSettings, error) {
 	options := &UnixfsLsSettings{
 		Async: true,
+
+		ResolveSize: true,
+		ResolveType: true,
 	}
 
 	for _, opt := range opts {
@@ -333,7 +336,7 @@ func (unixfsOpts) ResolveSize(resolve bool) UnixfsLsOption {
 
 func (unixfsOpts) ResolveType(resolve bool) UnixfsLsOption {
 	return func(settings *UnixfsLsSettings) error {
-		settings.ResolveSize = resolve
+		settings.ResolveType = resolve
 		return nil
 	}
-}
\ No newline at end of file
+}

From 9f41461f572ba3ed3e2a9c247521690595705d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 2 Feb 2019 03:42:00 +0100
Subject: [PATCH 183/247] coreapi: stream only ls, handle storting in command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a62acc82d4b5f8135f1d1249a22e91572a9a03c0

This commit was moved from ipfs/boxo@328e6f8ac9b4229e990201a93954213be992c45d
---
 core/coreiface/options/unixfs.go | 14 --------------
 core/coreiface/tests/unixfs.go   | 21 +--------------------
 core/coreiface/unixfs.go         |  3 ++-
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 4ff5cdb3f..7e77410bc 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -43,8 +43,6 @@ type UnixfsAddSettings struct {
 }
 
 type UnixfsLsSettings struct {
-	Async bool
-
 	ResolveType bool
 	ResolveSize bool
 }
@@ -132,8 +130,6 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 
 func UnixfsLsOptions(opts ...UnixfsLsOption) (*UnixfsLsSettings, error) {
 	options := &UnixfsLsSettings{
-		Async: true,
-
 		ResolveSize: true,
 		ResolveType: true,
 	}
@@ -317,16 +313,6 @@ func (unixfsOpts) Nocopy(enable bool) UnixfsAddOption {
 	}
 }
 
-// Async tells ls to return results as soon as they are available, which can be
-// useful for listing HAMT directories. When this option is set to true returned
-// results won't be returned in order
-func (unixfsOpts) Async(async bool) UnixfsLsOption {
-	return func(settings *UnixfsLsSettings) error {
-		settings.Async = async
-		return nil
-	}
-}
-
 func (unixfsOpts) ResolveSize(resolve bool) UnixfsLsOption {
 	return func(settings *UnixfsLsSettings) error {
 		settings.ResolveSize = resolve
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index b2b5a9ebb..054461de1 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -749,7 +749,7 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Error(err)
 	}
 
-	links, err := api.Unixfs().Ls(ctx, p, options.Unixfs.Async(false))
+	links, err := api.Unixfs().Ls(ctx, p)
 	if err != nil {
 		t.Error(err)
 	}
@@ -767,25 +767,6 @@ func (tp *provider) TestLs(t *testing.T) {
 	if _, ok := <-links; ok {
 		t.Errorf("didn't expect a second link")
 	}
-
-	links, err = api.Unixfs().Ls(ctx, p, options.Unixfs.Async(true))
-	if err != nil {
-		t.Error(err)
-	}
-
-	link = (<-links).Link
-	if link.Size != 23 {
-		t.Fatalf("expected size = 23, got %d", link.Size)
-	}
-	if link.Name != "name-of-file" {
-		t.Fatalf("expected name = name-of-file, got %s", link.Name)
-	}
-	if link.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
-		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", link.Cid)
-	}
-	if _, ok := <-links; ok {
-		t.Errorf("didn't expect a second link")
-	}
 }
 
 func (tp *provider) TestEntriesExpired(t *testing.T) {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 846b74629..a77011988 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -38,6 +38,7 @@ type UnixfsAPI interface {
 	// to operations performed on the returned file
 	Get(context.Context, Path) (files.Node, error)
 
-	// Ls returns the list of links in a directory
+	// Ls returns the list of links in a directory. Links aren't guaranteed to be
+	// returned in order
 	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan LsLink, error)
 }

From 39204505d087da8853f0800111b03348d5d896ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 2 Feb 2019 17:13:28 +0100
Subject: [PATCH 184/247] coreapi ls: merge ResolveType and ResolveSize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@d93b9f110ec9df2fb0e4f840974243ae878ffdf6

This commit was moved from ipfs/boxo@8d88635d4a9ae6462528d7a6cd7737ecbd5716de
---
 core/coreiface/options/unixfs.go | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 7e77410bc..015c2dca3 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -43,8 +43,7 @@ type UnixfsAddSettings struct {
 }
 
 type UnixfsLsSettings struct {
-	ResolveType bool
-	ResolveSize bool
+	ResolveChildren bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -130,8 +129,7 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 
 func UnixfsLsOptions(opts ...UnixfsLsOption) (*UnixfsLsSettings, error) {
 	options := &UnixfsLsSettings{
-		ResolveSize: true,
-		ResolveType: true,
+		ResolveChildren: true,
 	}
 
 	for _, opt := range opts {
@@ -313,16 +311,9 @@ func (unixfsOpts) Nocopy(enable bool) UnixfsAddOption {
 	}
 }
 
-func (unixfsOpts) ResolveSize(resolve bool) UnixfsLsOption {
+func (unixfsOpts) ResolveChildren(resolve bool) UnixfsLsOption {
 	return func(settings *UnixfsLsSettings) error {
-		settings.ResolveSize = resolve
-		return nil
-	}
-}
-
-func (unixfsOpts) ResolveType(resolve bool) UnixfsLsOption {
-	return func(settings *UnixfsLsSettings) error {
-		settings.ResolveType = resolve
+		settings.ResolveChildren = resolve
 		return nil
 	}
 }

From eac8515c0b25512058d104042fdfde3e7d63d34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 2 Feb 2019 17:27:54 +0100
Subject: [PATCH 185/247] coreapi: mirror unixfs file types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e8196db410d2fc38fb64613bebedccc79c1ecaec

This commit was moved from ipfs/boxo@e47af31e2d3e5b497f91392603ed5f6b760f6eff
---
 core/coreiface/unixfs.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index a77011988..1fb07638f 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs/pb"
+	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 )
@@ -16,10 +16,21 @@ type AddEvent struct {
 	Size  string       `json:",omitempty"`
 }
 
+type FileType int32
+
+const (
+	TRaw       = FileType(unixfs.TRaw)
+	TFile      = FileType(unixfs.TFile)
+	TDirectory = FileType(unixfs.TDirectory)
+	TMetadata  = FileType(unixfs.TMetadata)
+	TSymlink   = FileType(unixfs.TSymlink)
+	THAMTShard = FileType(unixfs.THAMTShard)
+)
+
 type LsLink struct {
 	Link *ipld.Link
 	Size uint64
-	Type unixfs_pb.Data_DataType
+	Type FileType
 
 	Err error
 }

From abebd4e1d81dc18a53db02f740784084c7ab3a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 4 Feb 2019 18:05:05 +0100
Subject: [PATCH 186/247] block put --pin option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@005752045c872e4dabb17e5c9ba1732f3cf04ea6

This commit was moved from ipfs/boxo@9ea89f38600dab60d9a09740c28d935ef9bfc202
---
 core/coreiface/options/block.go | 11 ++++++++++
 core/coreiface/tests/block.go   | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index ea4ae26bb..40dfba79a 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -10,6 +10,7 @@ type BlockPutSettings struct {
 	Codec    string
 	MhType   uint64
 	MhLength int
+	Pin      bool
 }
 
 type BlockRmSettings struct {
@@ -24,6 +25,7 @@ func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, cid.Prefix, err
 		Codec:    "",
 		MhType:   mh.SHA2_256,
 		MhLength: -1,
+		Pin:      false,
 	}
 
 	for _, opt := range opts {
@@ -105,6 +107,15 @@ func (blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
 	}
 }
 
+// Pin is an option for Block.Put which specifies whether to (recursively) pin
+// added blocks
+func (blockOpts) Pin(pin bool) BlockPutOption {
+	return func(settings *BlockPutSettings) error {
+		settings.Pin = pin
+		return nil
+	}
+}
+
 // Force is an option for Block.Rm which, when set to true, will ignore
 // non-existing blocks
 func (blockOpts) Force(force bool) BlockRmOption {
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 427ad3357..c2ee70a3a 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -26,6 +26,7 @@ func (tp *provider) TestBlock(t *testing.T) {
 	t.Run("TestBlockGet", tp.TestBlockGet)
 	t.Run("TestBlockRm", tp.TestBlockRm)
 	t.Run("TestBlockStat", tp.TestBlockStat)
+	t.Run("TestBlockPin", tp.TestBlockPin)
 }
 
 func (tp *provider) TestBlockPut(t *testing.T) {
@@ -203,3 +204,40 @@ func (tp *provider) TestBlockStat(t *testing.T) {
 		t.Error("length doesn't match")
 	}
 }
+
+func (tp *provider) TestBlockPin(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = api.Block().Put(ctx, strings.NewReader(`Hello`))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if pins, err := api.Pin().Ls(ctx); err != nil || len(pins) != 0 {
+		t.Fatal("expected 0 pins")
+	}
+
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Pin(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pins, err := api.Pin().Ls(ctx)
+	if err != nil {
+		return
+	}
+	if len(pins) != 1 {
+		t.Fatal("expected 1 pin")
+	}
+	if pins[0].Type() != "recursive" {
+		t.Error("expected a recursive pin")
+	}
+	if pins[0].Path().String() != res.Path().String() {
+		t.Error("pin path didn't match")
+	}
+}

From 6e4a14d89d5e8c88c29b026056606bc57d196499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 5 Feb 2019 20:20:27 +0100
Subject: [PATCH 187/247] coreapi: fix seek test on http impl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3291f565631f8ccbb1d09bb71e686265cc00803d

This commit was moved from ipfs/boxo@1e59d281dfae25d81b2f2dba9ca6138537c431a6
---
 core/coreiface/tests/unixfs.go | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 054461de1..1c21f4fd0 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"bytes"
 	"context"
+	"encoding/hex"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -754,9 +755,13 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Error(err)
 	}
 
-	link := (<-links).Link
-	if link.Size != 23 {
-		t.Fatalf("expected size = 23, got %d", link.Size)
+	linkRes := <-links
+	if linkRes.Err != nil {
+		t.Fatal(linkRes.Err)
+	}
+	link := linkRes.Link
+	if linkRes.Size != 15 {
+		t.Fatalf("expected size = 15, got %d", link.Size)
 	}
 	if link.Name != "name-of-file" {
 		t.Fatalf("expected name = name-of-file, got %s", link.Name)
@@ -764,8 +769,11 @@ func (tp *provider) TestLs(t *testing.T) {
 	if link.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
 		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", link.Cid)
 	}
-	if _, ok := <-links; ok {
+	if l, ok := <-links; ok {
 		t.Errorf("didn't expect a second link")
+		if l.Err != nil {
+			t.Error(l.Err)
+		}
 	}
 }
 
@@ -967,7 +975,7 @@ func (tp *provider) TestGetSeek(t *testing.T) {
 	}
 
 	orig := make([]byte, dataSize)
-	if _, err := f.Read(orig); err != nil {
+	if _, err := io.ReadFull(f, orig); err != nil {
 		t.Fatal(err)
 	}
 	f.Close()
@@ -1005,9 +1013,9 @@ func (tp *provider) TestGetSeek(t *testing.T) {
 			if err != nil {
 				t.Fatalf("orig: %s", err)
 			}
-			r, err := f.Read(buf)
+			r, err := io.ReadFull(f, buf)
 			switch {
-			case shouldEof && err != nil && err != io.EOF:
+			case shouldEof && err != nil && err != io.ErrUnexpectedEOF:
 				fallthrough
 			case !shouldEof && err != nil:
 				t.Fatalf("f: %s", err)
@@ -1029,6 +1037,8 @@ func (tp *provider) TestGetSeek(t *testing.T) {
 				t.Fatal("read different amount of data than bytes.Reader")
 			}
 			if !bytes.Equal(buf, origBuf) {
+				fmt.Fprintf(os.Stderr, "original:\n%s\n", hex.Dump(origBuf))
+				fmt.Fprintf(os.Stderr, "got:\n%s\n", hex.Dump(buf))
 				t.Fatal("data didn't match")
 			}
 		})
@@ -1039,6 +1049,7 @@ func (tp *provider) TestGetSeek(t *testing.T) {
 	test(500, io.SeekCurrent, 10, 10, false)
 	test(350, io.SeekStart, 100, 100, false)
 	test(-123, io.SeekCurrent, 100, 100, false)
+	test(0, io.SeekStart, int(dataSize), dataSize, false)
 	test(dataSize-50, io.SeekStart, 100, 50, true)
 	test(-5, io.SeekEnd, 100, 5, true)
 }

From be9d4de4d421fd9883404935b23c206e21021829 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 7 Feb 2019 17:11:29 -0800
Subject: [PATCH 188/247] gx: update go-libp2p-peer

Switch _back_ to the 0.4.18 style of peer IDs while we figure things out. See
https://github.com/libp2p/specs/issues/138.

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@67fd754fced65b8d75a92217fe265af48822cef1

This commit was moved from ipfs/boxo@132387d33db2093e89e1b97dbe292ba780debf0f
---
 core/coreiface/dht.go            | 4 ++--
 core/coreiface/key.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/pubsub.go         | 2 +-
 core/coreiface/swarm.go          | 6 +++---
 core/coreiface/tests/name.go     | 2 +-
 core/coreiface/tests/unixfs.go   | 6 +++---
 core/coreiface/unixfs.go         | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index ec8bd92c3..94fb3779f 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmPiemjiKBC9VA7vZF82m4x1oygtg2c2YVqag8PX7dN1BD/go-libp2p-peerstore"
-	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
+	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index f310c3cc2..69857e613 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 015c2dca3..0dd129609 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
+	dag "gx/ipfs/QmUtsx89yiCY6F8mbpP6ecXckiSzCBH7EvkKZuZEHBcr1m/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index b96e0e775..d59a851b4 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,8 +1,8 @@
 package iface
 
 import (
+	ipfspath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	ipfspath "gx/ipfs/QmWqh9oob7ZHQRwU5CdTqpnC8ip8BEkFNrwXRxeNo5Y7vA/go-path"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 867c8adc4..933673826 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 83e207282..3af078f17 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	ma "gx/ipfs/QmNTCey11oxhb1AxDnQBRHtdhap6Ctud872NjAYPYYXPuc/go-multiaddr"
-	net "gx/ipfs/QmNgLg1NTw37iWbYPKcyK85YJ9Whs1MkPtJwhfqbNYAyKg/go-libp2p-net"
-	pstore "gx/ipfs/QmPiemjiKBC9VA7vZF82m4x1oygtg2c2YVqag8PX7dN1BD/go-libp2p-peerstore"
-	"gx/ipfs/QmY5Grm8pJdiSSVsYxx4uNRgweY72EmYwuSDbRnbFok3iY/go-libp2p-peer"
+	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
+	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
+	net "gx/ipfs/QmZ7cBWUXkyWTMN4qH6NGoyMVs7JugyFChBNP4ZUp5rJHH/go-libp2p-net"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 )
 
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 8690f22c3..8d87bd495 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	ipath "gx/ipfs/QmWqh9oob7ZHQRwU5CdTqpnC8ip8BEkFNrwXRxeNo5Y7vA/go-path"
+	ipath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 1c21f4fd0..f5ce85b78 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -18,12 +18,12 @@ import (
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
-	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs/importer/helpers"
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+	mdag "gx/ipfs/QmUtsx89yiCY6F8mbpP6ecXckiSzCBH7EvkKZuZEHBcr1m/go-merkledag"
+	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"
+	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs/importer/helpers"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
-	mdag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 1fb07638f..8e559022c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	"gx/ipfs/QmQ1JnYpnzkaurjW1yxkQxC2w3K1PorNE1nv1vaP5Le7sq/go-unixfs"
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 )
 

From 23d84ed3ef15cb86a8c41d0db2db1007d650414f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 8 Feb 2019 17:58:56 +0100
Subject: [PATCH 189/247] coreapi: cleanup coredag references in interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@c3fa814784e5a96d5baeb5722bc51da7750a09ce

This commit was moved from ipfs/boxo@d15daa504fd1884c0e2a9c57ae3ae42343ec482e
---
 core/coreiface/tests/dag.go  | 53 ++++++++++++++++++------------------
 core/coreiface/tests/path.go | 32 ++++++++++++----------
 core/coreiface/tests/pin.go  | 22 ++++++++-------
 3 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 10fab125a..4decfebb4 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -8,8 +8,9 @@ import (
 	"testing"
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	coredag "github.com/ipfs/go-ipfs/core/coredag"
 
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
 
@@ -46,18 +47,18 @@ func (tp *provider) TestPut(t *testing.T) {
 		t.Error(err)
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Dag().Add(ctx, nds[0])
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
-		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
+	if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 }
 
@@ -69,18 +70,18 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 		t.Error(err)
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), mh.ID, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), mh.ID, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Dag().Add(ctx, nds[0])
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if nds[0].Cid().String() != "z5hRLNd2sv4z1c" {
-		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
+	if nd.Cid().String() != "z5hRLNd2sv4z1c" {
+		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 }
 
@@ -92,27 +93,27 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Error(err)
 	}
 
-	snds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"foo"`), math.MaxUint64, -1)
+	snd, err := ipldcbor.FromJSON(strings.NewReader(`"foo"`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Dag().Add(ctx, snds[0])
+	err = api.Dag().Add(ctx, snd)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+snds[0].Cid().String()+`"}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+snd.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Dag().Add(ctx, nds[0])
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	p, err := coreiface.ParsePath(path.Join(nds[0].Cid().String(), "lnk"))
+	p, err := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
 	if err != nil {
 		t.Error(err)
 	}
@@ -122,13 +123,13 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Error(err)
 	}
 
-	nd, err := api.Dag().Get(ctx, rp.Cid())
+	ndd, err := api.Dag().Get(ctx, rp.Cid())
 	if err != nil {
 		t.Error(err)
 	}
 
-	if nd.Cid().String() != snds[0].Cid().String() {
-		t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), snds[0].Cid().String())
+	if nd.Cid().String() != snd.Cid().String() {
+		t.Errorf("got unexpected cid %s, expected %s", ndd.Cid().String(), snd.Cid().String())
 	}
 }
 
@@ -140,17 +141,17 @@ func (tp *provider) TestTree(t *testing.T) {
 		t.Error(err)
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Dag().Add(ctx, nds[0])
+	err = api.Dag().Add(ctx, nd)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	res, err := api.Dag().Get(ctx, nds[0].Cid())
+	res, err := api.Dag().Get(ctx, nd.Cid())
 	if err != nil {
 		t.Error(err)
 	}
@@ -175,25 +176,25 @@ func (tp *provider) TestBatch(t *testing.T) {
 		t.Error(err)
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
-		t.Errorf("got wrong cid: %s", nds[0].Cid().String())
+	if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 
-	_, err = api.Dag().Get(ctx, nds[0].Cid())
+	_, err = api.Dag().Get(ctx, nd.Cid())
 	if err == nil || !strings.Contains(err.Error(), "not found") {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, nds); err != nil {
+	if err := api.Dag().AddMany(ctx, []ipld.Node{nd}); err != nil {
 		t.Error(err)
 	}
 
-	_, err = api.Dag().Get(ctx, nds[0].Cid())
+	_, err = api.Dag().Get(ctx, nd.Cid())
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index e7df6f1fb..5594cf0da 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -8,7 +8,8 @@ import (
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-	"github.com/ipfs/go-ipfs/core/coredag"
+
+	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
 )
 
 func (tp *provider) TestPath(t *testing.T) {
@@ -37,7 +38,8 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 		t.Error("expected /ipld path to be immutable")
 	}
 
-	// get self /ipns path
+	// get self /ipns path	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+
 	if api.Key() == nil {
 		t.Fatal(".Key not implemented")
 	}
@@ -64,16 +66,16 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, nds); err != nil {
+	if err := api.Dag().Add(ctx, nd); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(nds[0].String() + "/foo/bar")
+	p1, err := coreiface.ParsePath(nd.String() + "/foo/bar")
 	if err != nil {
 		t.Error(err)
 	}
@@ -100,16 +102,16 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, nds); err != nil {
+	if err := api.Dag().Add(ctx, nd); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(nds[0].Cid().String())
+	p1, err := coreiface.ParsePath(nd.Cid().String())
 	if err != nil {
 		t.Error(err)
 	}
@@ -136,16 +138,16 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, nds); err != nil {
+	if err := api.Dag().Add(ctx, nd); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/bar/baz")
+	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/bar/baz")
 	if err != nil {
 		t.Error(err)
 	}
@@ -177,16 +179,16 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(".Dag not implemented")
 	}
 
-	nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, nds); err != nil {
+	if err := api.Dag().Add(ctx, nd); err != nil {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/foo")
+	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/foo")
 	if err != nil {
 		t.Error(err)
 	}
@@ -196,7 +198,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if rp.Root().String() != nds[0].Cid().String() {
+	if rp.Root().String() != nd.Cid().String() {
 		t.Error("unexpected path root")
 	}
 
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 250799222..35c913618 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -8,7 +8,9 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface"
 	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-	"github.com/ipfs/go-ipfs/core/coredag"
+
+	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
 )
 
 func (tp *provider) TestPin(t *testing.T) {
@@ -111,26 +113,26 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Error(err)
 	}
 
-	nd2, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1)
+	nd2, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	nd3, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1)
+	nd3, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
 		t.Error(err)
 	}
 
-	if err := api.Dag().AddMany(ctx, append(nd2, nd3...)); err != nil {
+	if err := api.Dag().AddMany(ctx, []ipld.Node{nd2, nd3}); err != nil {
 		t.Fatal(err)
 	}
 
-	err = api.Pin().Add(ctx, iface.IpldPath(nd2[0].Cid()))
+	err = api.Pin().Add(ctx, iface.IpldPath(nd2.Cid()))
 	if err != nil {
 		t.Error(err)
 	}
 
-	err = api.Pin().Add(ctx, iface.IpldPath(nd3[0].Cid()), opt.Pin.Recursive(false))
+	err = api.Pin().Add(ctx, iface.IpldPath(nd3.Cid()), opt.Pin.Recursive(false))
 	if err != nil {
 		t.Error(err)
 	}
@@ -153,8 +155,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != iface.IpldPath(nd3[0].Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2[0].Cid()).String())
+	if list[0].Path().String() != iface.IpldPath(nd3.Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2.Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
@@ -166,8 +168,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != iface.IpldPath(nd2[0].Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3[0].Cid()).String())
+	if list[0].Path().String() != iface.IpldPath(nd2.Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3.Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())

From 97c433323baad09ba2dbcea901cd3acc5bbdc9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 8 Feb 2019 19:23:01 +0100
Subject: [PATCH 190/247] coreapi: move namesys options to coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@263199d56ec6e7f2dab7c8619b75e2a6fbcf5f15

This commit was moved from ipfs/boxo@a2f6e434b94663fc953c37e74156ee27b8ab73fe
---
 core/coreiface/options/name.go         |  2 +-
 core/coreiface/options/namesys/opts.go | 74 ++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 core/coreiface/options/namesys/opts.go

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index e2a0fc164..e07ef8a59 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -3,7 +3,7 @@ package options
 import (
 	"time"
 
-	ropts "github.com/ipfs/go-ipfs/namesys/opts"
+	ropts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
 )
 
 const (
diff --git a/core/coreiface/options/namesys/opts.go b/core/coreiface/options/namesys/opts.go
new file mode 100644
index 000000000..ee2bd5ac2
--- /dev/null
+++ b/core/coreiface/options/namesys/opts.go
@@ -0,0 +1,74 @@
+package nsopts
+
+import (
+	"time"
+)
+
+const (
+	// DefaultDepthLimit is the default depth limit used by Resolve.
+	DefaultDepthLimit = 32
+
+	// UnlimitedDepth allows infinite recursion in Resolve.  You
+	// probably don't want to use this, but it's here if you absolutely
+	// trust resolution to eventually complete and can't put an upper
+	// limit on how many steps it will take.
+	UnlimitedDepth = 0
+)
+
+// ResolveOpts specifies options for resolving an IPNS path
+type ResolveOpts struct {
+	// Recursion depth limit
+	Depth uint
+	// The number of IPNS records to retrieve from the DHT
+	// (the best record is selected from this set)
+	DhtRecordCount uint
+	// The amount of time to wait for DHT records to be fetched
+	// and verified. A zero value indicates that there is no explicit
+	// timeout (although there is an implicit timeout due to dial
+	// timeouts within the DHT)
+	DhtTimeout time.Duration
+}
+
+// DefaultResolveOpts returns the default options for resolving
+// an IPNS path
+func DefaultResolveOpts() ResolveOpts {
+	return ResolveOpts{
+		Depth:          DefaultDepthLimit,
+		DhtRecordCount: 16,
+		DhtTimeout:     time.Minute,
+	}
+}
+
+// ResolveOpt is used to set an option
+type ResolveOpt func(*ResolveOpts)
+
+// Depth is the recursion depth limit
+func Depth(depth uint) ResolveOpt {
+	return func(o *ResolveOpts) {
+		o.Depth = depth
+	}
+}
+
+// DhtRecordCount is the number of IPNS records to retrieve from the DHT
+func DhtRecordCount(count uint) ResolveOpt {
+	return func(o *ResolveOpts) {
+		o.DhtRecordCount = count
+	}
+}
+
+// DhtTimeout is the amount of time to wait for DHT records to be fetched
+// and verified. A zero value indicates that there is no explicit timeout
+func DhtTimeout(timeout time.Duration) ResolveOpt {
+	return func(o *ResolveOpts) {
+		o.DhtTimeout = timeout
+	}
+}
+
+// ProcessOpts converts an array of ResolveOpt into a ResolveOpts object
+func ProcessOpts(opts []ResolveOpt) ResolveOpts {
+	rsopts := DefaultResolveOpts()
+	for _, option := range opts {
+		option(&rsopts)
+	}
+	return rsopts
+}

From 46dbdf4d64dee7706d3c22804179bdfb2080a8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 8 Feb 2019 20:38:21 +0100
Subject: [PATCH 191/247] coreapi: fix failing dag test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@268b4fdbf1604d9296e09fe2cf1cf3328f498898

This commit was moved from ipfs/boxo@ea6b30e219991d9a4125537ac16e3e50df0650d8
---
 core/coreiface/tests/dag.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 4decfebb4..cf332027c 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -128,7 +128,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Error(err)
 	}
 
-	if nd.Cid().String() != snd.Cid().String() {
+	if ndd.Cid().String() != snd.Cid().String() {
 		t.Errorf("got unexpected cid %s, expected %s", ndd.Cid().String(), snd.Cid().String())
 	}
 }

From af23d0324bce51a7e51a56f6f514bb84d519664c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 9 Feb 2019 01:15:09 +0100
Subject: [PATCH 192/247] Update imports

This commit was moved from ipfs/interface-go-ipfs-core@515a114be219fdfdeed3f26c56c91fb7477439bb

This commit was moved from ipfs/boxo@5c537a46d37b548c6a830a7ea9ca8aca833e9acc
---
 core/coreiface/block.go        | 2 +-
 core/coreiface/coreapi.go      | 2 +-
 core/coreiface/dht.go          | 2 +-
 core/coreiface/key.go          | 2 +-
 core/coreiface/name.go         | 2 +-
 core/coreiface/object.go       | 2 +-
 core/coreiface/options/name.go | 2 +-
 core/coreiface/pin.go          | 2 +-
 core/coreiface/pubsub.go       | 2 +-
 core/coreiface/tests/api.go    | 2 +-
 core/coreiface/tests/block.go  | 4 ++--
 core/coreiface/tests/dag.go    | 2 +-
 core/coreiface/tests/dht.go    | 4 ++--
 core/coreiface/tests/key.go    | 4 ++--
 core/coreiface/tests/name.go   | 4 ++--
 core/coreiface/tests/object.go | 4 ++--
 core/coreiface/tests/path.go   | 4 ++--
 core/coreiface/tests/pin.go    | 4 ++--
 core/coreiface/tests/pubsub.go | 5 +++--
 core/coreiface/tests/unixfs.go | 4 ++--
 core/coreiface/unixfs.go       | 2 +-
 21 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index b99b05fdb..587ad339f 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 // BlockStat contains information about a block
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index d26ec4f7d..651af8bf0 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 )
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 94fb3779f..b3f7879e3 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 69857e613..154f82b66 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index a02bc0787..51b005b7e 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var ErrResolveFailed = errors.New("could not resolve name")
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 2ed357cb6..28613aaa0 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index e07ef8a59..59aaf2ca3 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -3,7 +3,7 @@ package options
 import (
 	"time"
 
-	ropts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
+	ropts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
 )
 
 const (
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 6e13def8f..6a7dab413 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 // Pin holds information about pinned resource
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 933673826..40cea689a 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 7a4bd7386..5e7c1f541 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
 )
 
 var apiNotImplemented = errors.New("api not implemented")
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index c2ee70a3a..2e0a84b40 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index cf332027c..9e0bc34ba 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index d2eae1af4..1793cd738 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestDht(t *testing.T) {
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 66011f99f..dbbfce059 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestKey(t *testing.T) {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 8d87bd495..eb5cd1e3a 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -11,8 +11,8 @@ import (
 	ipath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestName(t *testing.T) {
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 2a3b1bd5c..026def73b 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestObject(t *testing.T) {
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 5594cf0da..01841d869 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
 )
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 35c913618..27ed2ad5d 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index b993f51dc..14e3545a9 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -2,10 +2,11 @@ package tests
 
 import (
 	"context"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 	"testing"
 	"time"
+
+	"github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestPubSub(t *testing.T) {
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index f5ce85b78..cb5897b69 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -15,8 +15,8 @@ import (
 	"sync"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 8e559022c..c01ccde78 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,7 +2,7 @@ package iface
 
 import (
 	"context"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"

From 152a54ad8586075d70a281587489740137802e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 9 Feb 2019 01:23:13 +0100
Subject: [PATCH 193/247] gx-go uw

This commit was moved from ipfs/interface-go-ipfs-core@93299fcb14d845e3ed4c128f0792f18458794c62

This commit was moved from ipfs/boxo@def3b3d8058572379b772d2db227011fd45662ee
---
 core/coreiface/coreapi.go        |  2 +-
 core/coreiface/dag.go            |  2 +-
 core/coreiface/dht.go            |  4 ++--
 core/coreiface/key.go            |  2 +-
 core/coreiface/object.go         |  4 ++--
 core/coreiface/options/block.go  |  4 ++--
 core/coreiface/options/unixfs.go |  6 +++---
 core/coreiface/path.go           |  4 ++--
 core/coreiface/pubsub.go         |  2 +-
 core/coreiface/swarm.go          | 10 +++++-----
 core/coreiface/tests/block.go    |  2 +-
 core/coreiface/tests/dag.go      |  6 +++---
 core/coreiface/tests/name.go     |  4 ++--
 core/coreiface/tests/path.go     |  4 ++--
 core/coreiface/tests/pin.go      |  4 ++--
 core/coreiface/tests/unixfs.go   | 14 +++++++-------
 core/coreiface/unixfs.go         |  6 +++---
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 651af8bf0..f3433c089 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	ipld "github.com/ipfs/go-ipld-format"
 )
 
 // CoreAPI defines an unified interface to IPFS for Go programs
diff --git a/core/coreiface/dag.go b/core/coreiface/dag.go
index d15e24360..3cc3aeb4d 100644
--- a/core/coreiface/dag.go
+++ b/core/coreiface/dag.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	ipld "github.com/ipfs/go-ipld-format"
 )
 
 // APIDagService extends ipld.DAGService
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index b3f7879e3..d1ae05125 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
-	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 154f82b66..78c29d268 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -5,7 +5,7 @@ import (
 
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 
-	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 28613aaa0..4f9652fb1 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -6,8 +6,8 @@ import (
 
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
+	cid "github.com/ipfs/go-cid"
+	ipld "github.com/ipfs/go-ipld-format"
 )
 
 // ObjectStat provides information about dag nodes
diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 40dfba79a..043dfdea4 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -2,8 +2,8 @@ package options
 
 import (
 	"fmt"
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	cid "github.com/ipfs/go-cid"
+	mh "github.com/multiformats/go-multihash"
 )
 
 type BlockPutSettings struct {
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 0dd129609..b76b01adf 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	dag "gx/ipfs/QmUtsx89yiCY6F8mbpP6ecXckiSzCBH7EvkKZuZEHBcr1m/go-merkledag"
-	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	cid "github.com/ipfs/go-cid"
+	dag "github.com/ipfs/go-merkledag"
+	mh "github.com/multiformats/go-multihash"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index d59a851b4..4e86172ac 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,8 +1,8 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
-	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
+	"github.com/ipfs/go-cid"
+	ipfspath "github.com/ipfs/go-path"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 40cea689a..212e77225 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 
-	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 3af078f17..2e00ecbd3 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
-	ma "gx/ipfs/QmNTCey11oxhb1AxDnQBRHtdhap6Ctud872NjAYPYYXPuc/go-multiaddr"
-	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
-	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
-	net "gx/ipfs/QmZ7cBWUXkyWTMN4qH6NGoyMVs7JugyFChBNP4ZUp5rJHH/go-libp2p-net"
-	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	net "github.com/libp2p/go-libp2p-net"
+	"github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	"github.com/libp2p/go-libp2p-protocol"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var (
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 2e0a84b40..3cd74358d 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -9,7 +9,7 @@ import (
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
-	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	mh "github.com/multiformats/go-multihash"
 )
 
 func (tp *provider) TestBlock(t *testing.T) {
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 9e0bc34ba..7446c20de 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -9,9 +9,9 @@ import (
 
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
-	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
-	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	ipldcbor "github.com/ipfs/go-ipld-cbor"
+	ipld "github.com/ipfs/go-ipld-format"
+	mh "github.com/multiformats/go-multihash"
 )
 
 func (tp *provider) TestDag(t *testing.T) {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index eb5cd1e3a..1eb2dd513 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	ipath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
-	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
+	"github.com/ipfs/go-ipfs-files"
+	ipath "github.com/ipfs/go-path"
 
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 01841d869..4da1a5181 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -9,7 +9,7 @@ import (
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+	ipldcbor "github.com/ipfs/go-ipld-cbor"
 )
 
 func (tp *provider) TestPath(t *testing.T) {
@@ -38,7 +38,7 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 		t.Error("expected /ipld path to be immutable")
 	}
 
-	// get self /ipns path	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+	// get self /ipns path
 
 	if api.Key() == nil {
 		t.Fatal(".Key not implemented")
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 27ed2ad5d..eed542283 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -9,8 +9,8 @@ import (
 	"github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
-	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
+	ipldcbor "github.com/ipfs/go-ipld-cbor"
+	ipld "github.com/ipfs/go-ipld-format"
 )
 
 func (tp *provider) TestPin(t *testing.T) {
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index cb5897b69..bcb5331d5 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -18,13 +18,13 @@ import (
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
-	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
-	mdag "gx/ipfs/QmUtsx89yiCY6F8mbpP6ecXckiSzCBH7EvkKZuZEHBcr1m/go-merkledag"
-	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"
-	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs/importer/helpers"
-	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
-	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-ipfs-files"
+	cbor "github.com/ipfs/go-ipld-cbor"
+	mdag "github.com/ipfs/go-merkledag"
+	"github.com/ipfs/go-unixfs"
+	"github.com/ipfs/go-unixfs/importer/helpers"
+	mh "github.com/multiformats/go-multihash"
 )
 
 func (tp *provider) TestUnixfs(t *testing.T) {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index c01ccde78..5aae00dc4 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
-	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"
-	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
+	"github.com/ipfs/go-ipfs-files"
+	ipld "github.com/ipfs/go-ipld-format"
+	"github.com/ipfs/go-unixfs"
 )
 
 type AddEvent struct {

From 0a6bdbaa6cfa478a88b43a724695698e2e53414c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 12 Feb 2019 13:30:07 +0100
Subject: [PATCH 194/247] pubsub: fix race in test

This commit was moved from ipfs/interface-go-ipfs-core@a84bfa1f4055bb15e3727841df03c3f306ed5cfc

This commit was moved from ipfs/boxo@bc7e36143ffe315dc853eecd39d4be5e9b1ab425
---
 core/coreiface/tests/pubsub.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index 14e3545a9..bb870de6c 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -38,7 +38,7 @@ func (tp *provider) TestBasicPubSub(t *testing.T) {
 		tick := time.Tick(100 * time.Millisecond)
 
 		for {
-			err = apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
+			err := apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
 			if err != nil {
 				t.Fatal(err)
 			}

From 8542b6569a6169c39694cda227378484b6b40e18 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 19 Feb 2019 02:39:21 -0800
Subject: [PATCH 195/247] errors: introduce a 'not supported' error

This commit was moved from ipfs/interface-go-ipfs-core@a81e4359ce5808c1de22b5ec3c6f05b83d86499d

This commit was moved from ipfs/boxo@2c70ad1761014168a0bdd27b6ec4628cb08e1001
---
 core/coreiface/errors.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 234abe566..e0bd7805d 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -3,7 +3,8 @@ package iface
 import "errors"
 
 var (
-	ErrIsDir   = errors.New("this dag node is a directory")
-	ErrNotFile = errors.New("this dag node is not a regular file")
-	ErrOffline = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
+	ErrIsDir        = errors.New("this dag node is a directory")
+	ErrNotFile      = errors.New("this dag node is not a regular file")
+	ErrOffline      = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
+	ErrNotSupported = errors.New("operation not supported")
 )

From 987a46a697747db37898d501e7efeed72e4989c4 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 4 Mar 2019 20:11:38 -0800
Subject: [PATCH 196/247] tweak the Ls interface

1. Avoid `ipld.Link`. This is a protodag specific thing that will go away in
   future IPLD versions.
2. Avoid exposing the underlying file types. The user shouldn't care if they're
   dealing with a hamt, etc.
3. Add a field for a symlink's target.
4. Rename LsLink to DirEntry to better this type's role.


This commit was moved from ipfs/interface-go-ipfs-core@dbee8cc1adb3b53a10ea33add0584b030f92106a

This commit was moved from ipfs/boxo@9c3cf70c5f23696257374f5f42212364d706d427
---
 core/coreiface/tests/unixfs.go | 23 +++++++++++-----------
 core/coreiface/unixfs.go       | 36 +++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index bcb5331d5..a0c33c0b0 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -750,26 +750,25 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Error(err)
 	}
 
-	links, err := api.Unixfs().Ls(ctx, p)
+	entries, err := api.Unixfs().Ls(ctx, p)
 	if err != nil {
 		t.Error(err)
 	}
 
-	linkRes := <-links
-	if linkRes.Err != nil {
-		t.Fatal(linkRes.Err)
+	entry := <-entries
+	if entry.Err != nil {
+		t.Fatal(entry.Err)
 	}
-	link := linkRes.Link
-	if linkRes.Size != 15 {
-		t.Fatalf("expected size = 15, got %d", link.Size)
+	if entry.Size != 15 {
+		t.Fatalf("expected size = 15, got %d", entry.Size)
 	}
-	if link.Name != "name-of-file" {
-		t.Fatalf("expected name = name-of-file, got %s", link.Name)
+	if entry.Name != "name-of-file" {
+		t.Fatalf("expected name = name-of-file, got %s", entry.Name)
 	}
-	if link.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
-		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", link.Cid)
+	if entry.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
+		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", entry.Cid)
 	}
-	if l, ok := <-links; ok {
+	if l, ok := <-entries; ok {
 		t.Errorf("didn't expect a second link")
 		if l.Err != nil {
 			t.Error(l.Err)
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 5aae00dc4..bdf08b5c3 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,9 +4,8 @@ import (
 	"context"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/ipfs/go-ipfs-files"
-	ipld "github.com/ipfs/go-ipld-format"
-	"github.com/ipfs/go-unixfs"
+	cid "github.com/ipfs/go-cid"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 type AddEvent struct {
@@ -16,21 +15,30 @@ type AddEvent struct {
 	Size  string       `json:",omitempty"`
 }
 
+// FileType is an enum of possible UnixFS file types.
 type FileType int32
 
 const (
-	TRaw       = FileType(unixfs.TRaw)
-	TFile      = FileType(unixfs.TFile)
-	TDirectory = FileType(unixfs.TDirectory)
-	TMetadata  = FileType(unixfs.TMetadata)
-	TSymlink   = FileType(unixfs.TSymlink)
-	THAMTShard = FileType(unixfs.THAMTShard)
+	// TUnknown means the file type isn't known (e.g., it hasn't been
+	// resolved).
+	TUnknown FileType = iota
+	// TFile is a regular file.
+	TFile
+	// TDirectory is a directory.
+	TDirectory
+	// TSymlink is a symlink.
+	TSymlink
 )
 
-type LsLink struct {
-	Link *ipld.Link
-	Size uint64
-	Type FileType
+// DirEntry is a directory entry returned by `Ls`.
+type DirEntry struct {
+	Name string
+	Cid  cid.Cid
+
+	// Only filled when asked to resolve the directory entry.
+	Size   uint64   // The size of the file in bytes (or the size of the symlink).
+	Type   FileType // The type of the file.
+	Target Path     // The symlink target (if a symlink).
 
 	Err error
 }
@@ -51,5 +59,5 @@ type UnixfsAPI interface {
 
 	// Ls returns the list of links in a directory. Links aren't guaranteed to be
 	// returned in order
-	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan LsLink, error)
+	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan DirEntry, error)
 }

From 483caf76fd36aeebc9d4ea2caf02e007271c5fd1 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 5 Mar 2019 09:36:58 -0800
Subject: [PATCH 197/247] file type: add stringer

This commit was moved from ipfs/interface-go-ipfs-core@4e99a8e9250040b9cfc9600641d138fca8ff01f9

This commit was moved from ipfs/boxo@ee697a3b097c25457cccf63c42ba03fadde9d4ef
---
 core/coreiface/unixfs.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index bdf08b5c3..d0e3ec572 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -30,6 +30,21 @@ const (
 	TSymlink
 )
 
+func (t FileType) String() string {
+	switch t {
+	case TUnknown:
+		return "unknown"
+	case TFile:
+		return "file"
+	case TDirectory:
+		return "directory"
+	case TSymlink:
+		return "symlink"
+	default:
+		return "<unknown file type>"
+	}
+}
+
 // DirEntry is a directory entry returned by `Ls`.
 type DirEntry struct {
 	Name string

From cc2b187d07091d649f29f129bcd57078cbec9aba Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 5 Mar 2019 09:37:40 -0800
Subject: [PATCH 198/247] tests: add symlink target test

(also, fix some error versus fatal nits)


This commit was moved from ipfs/interface-go-ipfs-core@5c6a751986f6d5fe1174819442fcd5f60e0a6f7d

This commit was moved from ipfs/boxo@4be6e60dbea5e9dd8cf37d1f7a5b038e2a18dbf7
---
 core/coreiface/tests/unixfs.go | 35 +++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index a0c33c0b0..b8b22e50a 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -737,22 +737,23 @@ func (tp *provider) TestLs(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	r := strings.NewReader("content-of-file")
 	p, err := api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{
 		"0": files.NewMapDirectory(map[string]files.Node{
-			"name-of-file": files.NewReaderFile(r),
+			"name-of-file":    files.NewReaderFile(r),
+			"name-of-symlink": files.NewLinkFile("/foo/bar", nil),
 		}),
 	}))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	entries, err := api.Unixfs().Ls(ctx, p)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	entry := <-entries
@@ -760,13 +761,33 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Fatal(entry.Err)
 	}
 	if entry.Size != 15 {
-		t.Fatalf("expected size = 15, got %d", entry.Size)
+		t.Errorf("expected size = 15, got %d", entry.Size)
 	}
 	if entry.Name != "name-of-file" {
-		t.Fatalf("expected name = name-of-file, got %s", entry.Name)
+		t.Errorf("expected name = name-of-file, got %s", entry.Name)
+	}
+	if entry.Type != coreiface.TFile {
+		t.Errorf("wrong type %s", entry.Type)
 	}
 	if entry.Cid.String() != "QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr" {
-		t.Fatalf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", entry.Cid)
+		t.Errorf("expected cid = QmX3qQVKxDGz3URVC3861Z3CKtQKGBn6ffXRBBWGMFz9Lr, got %s", entry.Cid)
+	}
+	entry = <-entries
+	if entry.Err != nil {
+		t.Fatal(entry.Err)
+	}
+	if entry.Type != coreiface.TSymlink {
+		t.Errorf("wrong type %s", entry.Type)
+	}
+	if entry.Name != "name-of-symlink" {
+		t.Errorf("expected name = name-of-symlink, got %s", entry.Name)
+	}
+	if entry.Target.String() != "/foo/bar" {
+		t.Errorf("expected symlink target to be /foo/bar, got %s", entry.Target)
+	}
+
+	if int(entry.Size) != len(entry.Target.String()) {
+		t.Errorf("expected size = %d, got %d", len(entry.Target.String()), entry.Size)
 	}
 	if l, ok := <-entries; ok {
 		t.Errorf("didn't expect a second link")

From 30b344a5af44bae2c7606e18126f0cf66f73915e Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 5 Mar 2019 09:54:43 -0800
Subject: [PATCH 199/247] switch symlink target type to string

(path can't represent relative paths)


This commit was moved from ipfs/interface-go-ipfs-core@368881fa4a30814112d1b2096c37c91f5fd16976

This commit was moved from ipfs/boxo@e2900773a64d532ccbbabd5ed23c048270bfbefe
---
 core/coreiface/tests/unixfs.go | 6 +++---
 core/coreiface/unixfs.go       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index b8b22e50a..79dedf155 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -782,12 +782,12 @@ func (tp *provider) TestLs(t *testing.T) {
 	if entry.Name != "name-of-symlink" {
 		t.Errorf("expected name = name-of-symlink, got %s", entry.Name)
 	}
-	if entry.Target.String() != "/foo/bar" {
+	if entry.Target != "/foo/bar" {
 		t.Errorf("expected symlink target to be /foo/bar, got %s", entry.Target)
 	}
 
-	if int(entry.Size) != len(entry.Target.String()) {
-		t.Errorf("expected size = %d, got %d", len(entry.Target.String()), entry.Size)
+	if int(entry.Size) != len(entry.Target) {
+		t.Errorf("expected size = %d, got %d", len(entry.Target), entry.Size)
 	}
 	if l, ok := <-entries; ok {
 		t.Errorf("didn't expect a second link")
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index d0e3ec572..f9508f138 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -53,7 +53,7 @@ type DirEntry struct {
 	// Only filled when asked to resolve the directory entry.
 	Size   uint64   // The size of the file in bytes (or the size of the symlink).
 	Type   FileType // The type of the file.
-	Target Path     // The symlink target (if a symlink).
+	Target string   // The symlink target (if a symlink).
 
 	Err error
 }

From 5cdd4b3d81e43fb3a8d794315ce3b34d59afbbce Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 6 Mar 2019 16:41:05 -0800
Subject: [PATCH 200/247] remove target size requirement

It's complicated. We need to carefully think through how sizes work.


This commit was moved from ipfs/interface-go-ipfs-core@7a7cf9694be27b62820f05e2ac11bb4a57bab982

This commit was moved from ipfs/boxo@f5117736743ee8753e359aa7e7dbcaf602d75224
---
 core/coreiface/tests/unixfs.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 79dedf155..bbcb66899 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -786,9 +786,6 @@ func (tp *provider) TestLs(t *testing.T) {
 		t.Errorf("expected symlink target to be /foo/bar, got %s", entry.Target)
 	}
 
-	if int(entry.Size) != len(entry.Target) {
-		t.Errorf("expected size = %d, got %d", len(entry.Target), entry.Size)
-	}
 	if l, ok := <-entries; ok {
 		t.Errorf("didn't expect a second link")
 		if l.Err != nil {

From 01b61d76346799d4f762b7527466871aa6ad66d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 25 Feb 2019 17:10:23 +0100
Subject: [PATCH 201/247] unixfs add: Changes for fixed wrap logic

This commit was moved from ipfs/interface-go-ipfs-core@e87318a2c3620d2402517a6833e21749c065a397

This commit was moved from ipfs/boxo@1ec848f9a24d9c67927520cedcce7c2393893b9a
---
 core/coreiface/options/unixfs.go |  11 +++
 core/coreiface/tests/unixfs.go   | 116 ++++++++++++++++++-------------
 2 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index b76b01adf..44ba8c7cd 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -35,6 +35,7 @@ type UnixfsAddSettings struct {
 
 	Wrap      bool
 	Hidden    bool
+	TopHidden bool
 	StdinName string
 
 	Events   chan<- interface{}
@@ -69,6 +70,7 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 
 		Wrap:      false,
 		Hidden:    false,
+		TopHidden: false,
 		StdinName: "",
 
 		Events:   nil,
@@ -255,6 +257,15 @@ func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
 	}
 }
 
+// TopHidden enables adding of hidden files in top-level directory (files
+// prefixed with '.')
+func (unixfsOpts) TopHidden(hidden bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.TopHidden = hidden
+		return nil
+	}
+}
+
 // StdinName is the name set for files which don specify FilePath as
 // os.Stdin.Name()
 func (unixfsOpts) StdinName(name string) UnixfsAddOption {
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index bbcb66899..1ad319333 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -82,11 +82,14 @@ func flatDir() files.Node {
 	})
 }
 
-func wrapped(name string) func(f files.Node) files.Node {
+func wrapped(names ...string) func(f files.Node) files.Node {
 	return func(f files.Node) files.Node {
-		return files.NewMapDirectory(map[string]files.Node{
-			name: f,
-		})
+		for i := range names {
+			f = files.NewMapDirectory(map[string]files.Node{
+				names[len(names)-i-1]: f,
+			})
+		}
+		return f
 	}
 }
 
@@ -241,16 +244,30 @@ func (tp *provider) TestAdd(t *testing.T) {
 		},
 		// multi file
 		{
-			name: "simpleDir",
+			name: "simpleDirNoWrap",
 			data: flatDir,
-			wrap: "t",
 			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
 		},
 		{
-			name: "twoLevelDir",
-			data: twoLevelDir(),
-			wrap: "t",
-			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
+			name:   "simpleDirWrap",
+			data:   flatDir,
+			expect: wrapped("QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp"),
+			path:   "/ipfs/QmXxCaQkC8Z6Qws1nTkTQfCsL9y4XvWXnrPokp9bhmjC1L",
+			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
+		},
+		{
+			name:   "simpleDir",
+			data:   flatDir,
+			wrap:   "t",
+			expect: wrapped("t"),
+			path:   "/ipfs/Qmc3nGXm1HtUVCmnXLQHvWcNwfdZGpfg2SRm1CxLf7Q2Rm",
+		},
+		{
+			name:   "twoLevelDir",
+			data:   twoLevelDir(),
+			wrap:   "t",
+			expect: wrapped("t"),
+			path:   "/ipfs/QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg",
 		},
 		// wrapped
 		{
@@ -261,15 +278,6 @@ func (tp *provider) TestAdd(t *testing.T) {
 			},
 			wrap:   "foo",
 			expect: wrapped("foo"),
-			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
-		},
-		{
-			name: "addNotWrappedDirFile",
-			path: hello,
-			data: func() files.Node {
-				return files.NewBytesFile([]byte(helloStr))
-			},
-			wrap: "foo",
 		},
 		{
 			name: "stdinWrapped",
@@ -306,16 +314,16 @@ func (tp *provider) TestAdd(t *testing.T) {
 			name:   "twoLevelDirWrapped",
 			data:   twoLevelDir(),
 			wrap:   "t",
-			expect: wrapped("t"),
-			path:   "/ipfs/QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg",
+			expect: wrapped("QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg", "t"),
+			path:   "/ipfs/QmXzZwAh34pmNjuKsVGZfpbByis5S5qeZjCCUxa1ajZqzH",
 			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
 		},
 		{
 			name:   "twoLevelInlineHash",
 			data:   twoLevelDir(),
 			wrap:   "t",
-			expect: wrapped("t"),
-			path:   "/ipfs/zBunoruKoyCHKkALNSWxDvj4L7yuQnMgQ4hUa9j1Z64tVcDEcu6Zdetyu7eeFCxMPfxb7YJvHeFHoFoHMkBUQf6vfdhmi",
+			expect: wrapped("zBunoruKoyCHKkALNSWxDvj4L7yuQnMgQ4hUa9j1Z64tVcDEcu6Zdetyu7eeFCxMPfxb7YJvHeFHoFoHMkBUQf6vfdhmi", "t"),
+			path:   "/ipfs/QmUX6GykDGHTMtLmDkfjqs48QwQK82vou51xwaY9TSU7Zo",
 			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true), options.Unixfs.Hash(mh.SHA3)},
 		},
 		// hidden
@@ -328,17 +336,20 @@ func (tp *provider) TestAdd(t *testing.T) {
 					"foo":  files.NewBytesFile([]byte("hello1")),
 				})
 			},
-			wrap: "t",
-			path: "/ipfs/QmehGvpf2hY196MzDFmjL8Wy27S4jbgGDUAhBJyvXAwr3g",
-			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(true)},
+			wrap:   "t",
+			expect: wrapped("t"),
+			path:   "/ipfs/QmPXLSBX382vJDLrGakcbrZDkU3grfkjMox7EgSC9KFbtQ",
+			opts:   []options.UnixfsAddOption{options.Unixfs.Hidden(true)},
 		},
 		{
-			name: "hiddenFileAlwaysAdded",
+			name: "topHiddenFileAdded",
 			data: func() files.Node {
 				return files.NewBytesFile([]byte(helloStr))
 			},
-			wrap: ".foo",
-			path: hello,
+			wrap:   ".foo",
+			expect: wrapped(".foo"),
+			path:   "/ipfs/QmciAVG3krCbvzUaK9gr6jUgfEjQtYmuuXi1n67teQ4Ni2",
+			opts:   []options.UnixfsAddOption{options.Unixfs.TopHidden(true)},
 		},
 		{
 			name: "hiddenFilesNotAdded",
@@ -352,10 +363,25 @@ func (tp *provider) TestAdd(t *testing.T) {
 			expect: func(files.Node) files.Node {
 				return flatDir()
 			},
-			wrap: "t",
 			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
 			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
 		},
+		{
+			name: "hiddenFilesWrappedNotAdded",
+			data: func() files.Node {
+				return files.NewMapDirectory(map[string]files.Node{
+					".bar": files.NewBytesFile([]byte("hello2")),
+					"bar":  files.NewBytesFile([]byte("hello2")),
+					"foo":  files.NewBytesFile([]byte("hello1")),
+				})
+			},
+			expect: func(files.Node) files.Node {
+				return wrapped("t")(flatDir())
+			},
+			wrap: "t",
+			path: "/ipfs/Qmc3nGXm1HtUVCmnXLQHvWcNwfdZGpfg2SRm1CxLf7Q2Rm",
+			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
+		},
 		// NoCopy
 		{
 			name: "simpleNoCopy",
@@ -392,10 +418,9 @@ func (tp *provider) TestAdd(t *testing.T) {
 			data: twoLevelDir(),
 			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
 			events: []coreiface.AddEvent{
-				{Name: "t/abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
-				{Name: "t", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
+				{Name: "abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
+				{Name: "", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
 			},
-			wrap: "t",
 			opts: []options.UnixfsAddOption{options.Unixfs.Silent(true)},
 		},
 		{
@@ -403,13 +428,12 @@ func (tp *provider) TestAdd(t *testing.T) {
 			data: twoLevelDir(),
 			path: "/ipfs/QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr",
 			events: []coreiface.AddEvent{
-				{Name: "t/abc/def", Path: p("QmNyJpQkU1cEkBwMDhDNFstr42q55mqG5GE5Mgwug4xyGk"), Size: "13"},
-				{Name: "t/bar", Path: p("QmS21GuXiRMvJKHos4ZkEmQDmRBqRaF5tQS2CQCu2ne9sY"), Size: "14"},
-				{Name: "t/foo", Path: p("QmfAjGiVpTN56TXi6SBQtstit5BEw3sijKj1Qkxn6EXKzJ"), Size: "14"},
-				{Name: "t/abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
-				{Name: "t", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
+				{Name: "abc/def", Path: p("QmNyJpQkU1cEkBwMDhDNFstr42q55mqG5GE5Mgwug4xyGk"), Size: "13"},
+				{Name: "bar", Path: p("QmS21GuXiRMvJKHos4ZkEmQDmRBqRaF5tQS2CQCu2ne9sY"), Size: "14"},
+				{Name: "foo", Path: p("QmfAjGiVpTN56TXi6SBQtstit5BEw3sijKj1Qkxn6EXKzJ"), Size: "14"},
+				{Name: "abc", Path: p("QmU7nuGs2djqK99UNsNgEPGh6GV4662p6WtsgccBNGTDxt"), Size: "62"},
+				{Name: "", Path: p("QmVG2ZYCkV1S4TK8URA3a4RupBF17A8yAr4FqsRDXVJASr"), Size: "229"},
 			},
-			wrap: "t",
 		},
 		{
 			name: "progress1M",
@@ -528,14 +552,14 @@ func (tp *provider) TestAdd(t *testing.T) {
 				_, origDir := orig.(files.Directory)
 				_, gotDir := got.(files.Directory)
 
-				if origDir != gotDir {
-					t.Fatal("file type mismatch")
-				}
-
 				if origName != gotName {
 					t.Errorf("file name mismatch, orig='%s', got='%s'", origName, gotName)
 				}
 
+				if origDir != gotDir {
+					t.Fatalf("file type mismatch on %s", origName)
+				}
+
 				if !gotDir {
 					defer orig.Close()
 					defer got.Close()
@@ -804,9 +828,7 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 
 	r := strings.NewReader("content-of-file")
 	p, err := api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{
-		"0": files.NewMapDirectory(map[string]files.Node{
-			"name-of-file": files.NewReaderFile(r),
-		}),
+		"name-of-file": files.NewReaderFile(r),
 	}))
 	if err != nil {
 		t.Error(err)
@@ -846,7 +868,7 @@ func (tp *provider) TestLsEmptyDir(t *testing.T) {
 		t.Error(err)
 	}
 
-	_, err = api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{"0": files.NewSliceDirectory([]files.DirEntry{})}))
+	_, err = api.Unixfs().Add(ctx, files.NewSliceDirectory([]files.DirEntry{}))
 	if err != nil {
 		t.Error(err)
 	}

From a6fe80000c9e7d17491adc25a02882af3d53a829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sun, 10 Mar 2019 22:10:02 +0100
Subject: [PATCH 202/247] unixfs add: Remove hidden file handling

This commit was moved from ipfs/interface-go-ipfs-core@56944d64d1ad4bb349a3d1a30633d5bea06d6a2e

This commit was moved from ipfs/boxo@4274224bd095962491241080f0b1fc794d999239
---
 core/coreiface/options/unixfs.go | 21 ---------------
 core/coreiface/tests/unixfs.go   | 44 +-------------------------------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 44ba8c7cd..574d46b98 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -34,8 +34,6 @@ type UnixfsAddSettings struct {
 	NoCopy   bool
 
 	Wrap      bool
-	Hidden    bool
-	TopHidden bool
 	StdinName string
 
 	Events   chan<- interface{}
@@ -69,8 +67,6 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		NoCopy:   false,
 
 		Wrap:      false,
-		Hidden:    false,
-		TopHidden: false,
 		StdinName: "",
 
 		Events:   nil,
@@ -249,23 +245,6 @@ func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
 	}
 }
 
-// Hidden enables adding of hidden files (files prefixed with '.')
-func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
-	return func(settings *UnixfsAddSettings) error {
-		settings.Hidden = hidden
-		return nil
-	}
-}
-
-// TopHidden enables adding of hidden files in top-level directory (files
-// prefixed with '.')
-func (unixfsOpts) TopHidden(hidden bool) UnixfsAddOption {
-	return func(settings *UnixfsAddSettings) error {
-		settings.TopHidden = hidden
-		return nil
-	}
-}
-
 // StdinName is the name set for files which don specify FilePath as
 // os.Stdin.Name()
 func (unixfsOpts) StdinName(name string) UnixfsAddOption {
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 1ad319333..0defd2f32 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -328,7 +328,7 @@ func (tp *provider) TestAdd(t *testing.T) {
 		},
 		// hidden
 		{
-			name: "hiddenFiles",
+			name: "hiddenFilesAdded",
 			data: func() files.Node {
 				return files.NewMapDirectory(map[string]files.Node{
 					".bar": files.NewBytesFile([]byte("hello2")),
@@ -339,48 +339,6 @@ func (tp *provider) TestAdd(t *testing.T) {
 			wrap:   "t",
 			expect: wrapped("t"),
 			path:   "/ipfs/QmPXLSBX382vJDLrGakcbrZDkU3grfkjMox7EgSC9KFbtQ",
-			opts:   []options.UnixfsAddOption{options.Unixfs.Hidden(true)},
-		},
-		{
-			name: "topHiddenFileAdded",
-			data: func() files.Node {
-				return files.NewBytesFile([]byte(helloStr))
-			},
-			wrap:   ".foo",
-			expect: wrapped(".foo"),
-			path:   "/ipfs/QmciAVG3krCbvzUaK9gr6jUgfEjQtYmuuXi1n67teQ4Ni2",
-			opts:   []options.UnixfsAddOption{options.Unixfs.TopHidden(true)},
-		},
-		{
-			name: "hiddenFilesNotAdded",
-			data: func() files.Node {
-				return files.NewMapDirectory(map[string]files.Node{
-					".bar": files.NewBytesFile([]byte("hello2")),
-					"bar":  files.NewBytesFile([]byte("hello2")),
-					"foo":  files.NewBytesFile([]byte("hello1")),
-				})
-			},
-			expect: func(files.Node) files.Node {
-				return flatDir()
-			},
-			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
-			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
-		},
-		{
-			name: "hiddenFilesWrappedNotAdded",
-			data: func() files.Node {
-				return files.NewMapDirectory(map[string]files.Node{
-					".bar": files.NewBytesFile([]byte("hello2")),
-					"bar":  files.NewBytesFile([]byte("hello2")),
-					"foo":  files.NewBytesFile([]byte("hello1")),
-				})
-			},
-			expect: func(files.Node) files.Node {
-				return wrapped("t")(flatDir())
-			},
-			wrap: "t",
-			path: "/ipfs/Qmc3nGXm1HtUVCmnXLQHvWcNwfdZGpfg2SRm1CxLf7Q2Rm",
-			opts: []options.UnixfsAddOption{options.Unixfs.Hidden(false)},
 		},
 		// NoCopy
 		{

From 726e8c0db1b97af0b40f26ae6447662651d01ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 11 Mar 2019 13:36:57 +0100
Subject: [PATCH 203/247] unixfs: fix ls test for new add

This commit was moved from ipfs/interface-go-ipfs-core@91f8aac428155f9f302c3d6327c5f8659742013f

This commit was moved from ipfs/boxo@bd1689b886cda8cd5095b711df1eba9d15cabc7f
---
 core/coreiface/tests/unixfs.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 0defd2f32..d4af7c3f0 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -724,10 +724,8 @@ func (tp *provider) TestLs(t *testing.T) {
 
 	r := strings.NewReader("content-of-file")
 	p, err := api.Unixfs().Add(ctx, files.NewMapDirectory(map[string]files.Node{
-		"0": files.NewMapDirectory(map[string]files.Node{
-			"name-of-file":    files.NewReaderFile(r),
-			"name-of-symlink": files.NewLinkFile("/foo/bar", nil),
-		}),
+		"name-of-file":    files.NewReaderFile(r),
+		"name-of-symlink": files.NewLinkFile("/foo/bar", nil),
 	}))
 	if err != nil {
 		t.Fatal(err)

From 905898b66787e0970c3e26f1072e8d2471c644db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 11 Mar 2019 15:58:40 +0100
Subject: [PATCH 204/247] unixfs add: remove StdinName

This commit was moved from ipfs/interface-go-ipfs-core@e12c21afc03931525ceefc18be0bda8c71818d29

This commit was moved from ipfs/boxo@f3f74adfdbb7715898650b91985c61e3ba7a2788
---
 core/coreiface/options/unixfs.go | 15 ++-------------
 core/coreiface/tests/unixfs.go   | 18 ------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 574d46b98..578eb5320 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -33,8 +33,7 @@ type UnixfsAddSettings struct {
 	FsCache  bool
 	NoCopy   bool
 
-	Wrap      bool
-	StdinName string
+	Wrap bool
 
 	Events   chan<- interface{}
 	Silent   bool
@@ -66,8 +65,7 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		FsCache:  false,
 		NoCopy:   false,
 
-		Wrap:      false,
-		StdinName: "",
+		Wrap: false,
 
 		Events:   nil,
 		Silent:   false,
@@ -245,15 +243,6 @@ func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
 	}
 }
 
-// StdinName is the name set for files which don specify FilePath as
-// os.Stdin.Name()
-func (unixfsOpts) StdinName(name string) UnixfsAddOption {
-	return func(settings *UnixfsAddSettings) error {
-		settings.StdinName = name
-		return nil
-	}
-}
-
 // Events specifies channel which will be used to report events about ongoing
 // Add operation.
 //
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index d4af7c3f0..c27826b51 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -292,24 +292,6 @@ func (tp *provider) TestAdd(t *testing.T) {
 			},
 			opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
 		},
-		{
-			name: "stdinNamed",
-			path: "/ipfs/QmQ6cGBmb3ZbdrQW1MRm1RJnYnaxCqfssz7CrTa9NEhQyS",
-			data: func() files.Node {
-				rf, err := files.NewReaderPathFile(os.Stdin.Name(), ioutil.NopCloser(strings.NewReader(helloStr)), nil)
-				if err != nil {
-					panic(err)
-				}
-
-				return rf
-			},
-			expect: func(files.Node) files.Node {
-				return files.NewMapDirectory(map[string]files.Node{
-					"test": files.NewBytesFile([]byte(helloStr)),
-				})
-			},
-			opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.StdinName("test")},
-		},
 		{
 			name:   "twoLevelDirWrapped",
 			data:   twoLevelDir(),

From 84faa010ce5dbb944845c22658025f4a0523ab6d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 22 Mar 2019 15:05:41 -0700
Subject: [PATCH 205/247] remove Wrap

This can be trivially implemented by the end-user if desired. The best the
CoreAPI can do is name the file with it's own hash so this isn't really all that
helpful either.

Note: This differs from js-ipfs because _there_, all files have paths (even
outside directories).


This commit was moved from ipfs/interface-go-ipfs-core@ac37dde21aaeea010bbe50c8c37155e4471c0000

This commit was moved from ipfs/boxo@a0c8ed395649c7fcda2ceaccdd65aa13feb2d2ae
---
 core/coreiface/options/unixfs.go | 13 ------------
 core/coreiface/tests/unixfs.go   | 36 --------------------------------
 2 files changed, 49 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 578eb5320..3fd96f772 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -33,8 +33,6 @@ type UnixfsAddSettings struct {
 	FsCache  bool
 	NoCopy   bool
 
-	Wrap bool
-
 	Events   chan<- interface{}
 	Silent   bool
 	Progress bool
@@ -65,8 +63,6 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		FsCache:  false,
 		NoCopy:   false,
 
-		Wrap: false,
-
 		Events:   nil,
 		Silent:   false,
 		Progress: false,
@@ -234,15 +230,6 @@ func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	}
 }
 
-// Wrap tells the adder to wrap the added file structure with an additional
-// directory.
-func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
-	return func(settings *UnixfsAddSettings) error {
-		settings.Wrap = wrap
-		return nil
-	}
-}
-
 // Events specifies channel which will be used to report events about ongoing
 // Add operation.
 //
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index c27826b51..0fd494f66 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -248,13 +248,6 @@ func (tp *provider) TestAdd(t *testing.T) {
 			data: flatDir,
 			path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
 		},
-		{
-			name:   "simpleDirWrap",
-			data:   flatDir,
-			expect: wrapped("QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp"),
-			path:   "/ipfs/QmXxCaQkC8Z6Qws1nTkTQfCsL9y4XvWXnrPokp9bhmjC1L",
-			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
-		},
 		{
 			name:   "simpleDir",
 			data:   flatDir,
@@ -279,35 +272,6 @@ func (tp *provider) TestAdd(t *testing.T) {
 			wrap:   "foo",
 			expect: wrapped("foo"),
 		},
-		{
-			name: "stdinWrapped",
-			path: "/ipfs/QmU3r81oZycjHS9oaSHw37ootMFuFUw1DvMLKXPsezdtqU",
-			data: func() files.Node {
-				return files.NewBytesFile([]byte(helloStr))
-			},
-			expect: func(files.Node) files.Node {
-				return files.NewMapDirectory(map[string]files.Node{
-					"QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk": files.NewBytesFile([]byte(helloStr)),
-				})
-			},
-			opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
-		},
-		{
-			name:   "twoLevelDirWrapped",
-			data:   twoLevelDir(),
-			wrap:   "t",
-			expect: wrapped("QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg", "t"),
-			path:   "/ipfs/QmXzZwAh34pmNjuKsVGZfpbByis5S5qeZjCCUxa1ajZqzH",
-			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
-		},
-		{
-			name:   "twoLevelInlineHash",
-			data:   twoLevelDir(),
-			wrap:   "t",
-			expect: wrapped("zBunoruKoyCHKkALNSWxDvj4L7yuQnMgQ4hUa9j1Z64tVcDEcu6Zdetyu7eeFCxMPfxb7YJvHeFHoFoHMkBUQf6vfdhmi", "t"),
-			path:   "/ipfs/QmUX6GykDGHTMtLmDkfjqs48QwQK82vou51xwaY9TSU7Zo",
-			opts:   []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true), options.Unixfs.Hash(mh.SHA3)},
-		},
 		// hidden
 		{
 			name: "hiddenFilesAdded",

From 6190be29b97faebf6537ecf3eedb942d5c9eff08 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 26 Mar 2019 18:27:35 +0000
Subject: [PATCH 206/247] make unrecoverable test errors fatal

Otherwise, we can get random panics form dereferencing nil pointers.


This commit was moved from ipfs/interface-go-ipfs-core@6d166d40d8d347faa4a10aec30444999d5d7b85b

This commit was moved from ipfs/boxo@35272d3a3b89759460bf3fb96c15e36019036da4
---
 core/coreiface/tests/block.go  | 28 +++++++++----------
 core/coreiface/tests/dag.go    | 36 ++++++++++++------------
 core/coreiface/tests/key.go    | 26 ++++++++---------
 core/coreiface/tests/path.go   | 18 ++++++------
 core/coreiface/tests/pin.go    | 26 ++++++++---------
 core/coreiface/tests/unixfs.go | 51 ++++++++++++++++++----------------
 6 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 3cd74358d..d584ac98a 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -52,7 +52,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("cbor"))
@@ -70,7 +70,7 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
@@ -88,7 +88,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
@@ -98,12 +98,12 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 
 	r, err := api.Block().Get(ctx, res.Path())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	d, err := ioutil.ReadAll(r)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if string(d) != "Hello" {
@@ -112,7 +112,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 
 	p, err := coreiface.ParsePath("/ipfs/" + res.Path().Cid().String())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	rp, err := api.ResolvePath(ctx, p)
@@ -129,7 +129,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
@@ -139,12 +139,12 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 
 	r, err := api.Block().Get(ctx, res.Path())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	d, err := ioutil.ReadAll(r)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if string(d) != "Hello" {
@@ -153,7 +153,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 
 	err = api.Block().Rm(ctx, res.Path())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Block().Get(ctx, res.Path())
@@ -174,7 +174,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 
 	err = api.Block().Rm(ctx, res.Path(), opt.Block.Force(true))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 }
 
@@ -183,7 +183,7 @@ func (tp *provider) TestBlockStat(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
@@ -193,7 +193,7 @@ func (tp *provider) TestBlockStat(t *testing.T) {
 
 	stat, err := api.Block().Stat(ctx, res.Path())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if stat.Path().String() != res.Path().String() {
@@ -210,7 +210,7 @@ func (tp *provider) TestBlockPin(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Block().Put(ctx, strings.NewReader(`Hello`))
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 7446c20de..ff034beec 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -44,12 +44,12 @@ func (tp *provider) TestPut(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Dag().Add(ctx, nd)
@@ -67,12 +67,12 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), mh.ID, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Dag().Add(ctx, nd)
@@ -90,12 +90,12 @@ func (tp *provider) TestDagPath(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	snd, err := ipldcbor.FromJSON(strings.NewReader(`"foo"`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Dag().Add(ctx, snd)
@@ -105,7 +105,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+snd.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Dag().Add(ctx, nd)
@@ -115,17 +115,17 @@ func (tp *provider) TestDagPath(t *testing.T) {
 
 	p, err := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	ndd, err := api.Dag().Get(ctx, rp.Cid())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if ndd.Cid().String() != snd.Cid().String() {
@@ -138,12 +138,12 @@ func (tp *provider) TestTree(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Dag().Add(ctx, nd)
@@ -153,7 +153,7 @@ func (tp *provider) TestTree(t *testing.T) {
 
 	res, err := api.Dag().Get(ctx, nd.Cid())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	lst := res.Tree("", -1)
@@ -173,12 +173,12 @@ func (tp *provider) TestBatch(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
@@ -187,15 +187,15 @@ func (tp *provider) TestBatch(t *testing.T) {
 
 	_, err = api.Dag().Get(ctx, nd.Cid())
 	if err == nil || !strings.Contains(err.Error(), "not found") {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().AddMany(ctx, []ipld.Node{nd}); err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Dag().Get(ctx, nd.Cid())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 }
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index dbbfce059..7ff5f3330 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -121,7 +121,7 @@ func (tp *provider) TestGenerate(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	k, err := api.Key().Generate(ctx, "foo")
@@ -144,7 +144,7 @@ func (tp *provider) TestGenerateSize(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	k, err := api.Key().Generate(ctx, "foo", opt.Key.Size(1024))
@@ -169,7 +169,7 @@ func (tp *provider) TestGenerateType(t *testing.T) {
 
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	k, err := api.Key().Generate(ctx, "bar", opt.Key.Type(opt.Ed25519Key))
@@ -193,7 +193,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -226,7 +226,7 @@ func (tp *provider) TestList(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -272,7 +272,7 @@ func (tp *provider) TestRename(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -301,7 +301,7 @@ func (tp *provider) TestRenameToSelf(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -325,7 +325,7 @@ func (tp *provider) TestRenameToSelfForce(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -349,7 +349,7 @@ func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -379,7 +379,7 @@ func (tp *provider) TestRenameOverwrite(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	kfoo, err := api.Key().Generate(ctx, "foo")
@@ -418,7 +418,7 @@ func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -447,7 +447,7 @@ func (tp *provider) TestRenameSameName(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Key().Generate(ctx, "foo")
@@ -476,7 +476,7 @@ func (tp *provider) TestRemove(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	k, err := api.Key().Generate(ctx, "foo")
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 4da1a5181..b99e8ab9c 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -68,7 +68,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().Add(ctx, nd); err != nil {
@@ -77,7 +77,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 
 	p1, err := coreiface.ParsePath(nd.String() + "/foo/bar")
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	rp1, err := api.ResolvePath(ctx, p1)
@@ -104,7 +104,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().Add(ctx, nd); err != nil {
@@ -113,7 +113,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 
 	p1, err := coreiface.ParsePath(nd.Cid().String())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	rp1, err := api.ResolvePath(ctx, p1)
@@ -140,7 +140,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().Add(ctx, nd); err != nil {
@@ -149,7 +149,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 
 	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/bar/baz")
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.ResolvePath(ctx, p1)
@@ -181,7 +181,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 
 	nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().Add(ctx, nd); err != nil {
@@ -190,7 +190,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 
 	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/foo")
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	rp, err := api.ResolvePath(ctx, p1)
@@ -210,7 +210,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 func (tp *provider) TestPathJoin(t *testing.T) {
 	p1, err := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if coreiface.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index eed542283..ff6f98e35 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -31,17 +31,17 @@ func (tp *provider) TestPinAdd(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p, err := api.Unixfs().Add(ctx, strFile("foo")())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Pin().Add(ctx, p)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 }
 
@@ -50,17 +50,17 @@ func (tp *provider) TestPinSimple(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p, err := api.Unixfs().Add(ctx, strFile("foo")())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Pin().Add(ctx, p)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	list, err := api.Pin().Ls(ctx)
@@ -100,27 +100,27 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p0, err := api.Unixfs().Add(ctx, strFile("foo")())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p1, err := api.Unixfs().Add(ctx, strFile("bar")())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd2, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd3, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if err := api.Dag().AddMany(ctx, []ipld.Node{nd2, nd3}); err != nil {
@@ -129,12 +129,12 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 
 	err = api.Pin().Add(ctx, iface.IpldPath(nd2.Cid()))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	err = api.Pin().Add(ctx, iface.IpldPath(nd3.Cid()), opt.Pin.Recursive(false))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	list, err := api.Pin().Ls(ctx)
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index c27826b51..e99bf4429 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -98,7 +98,7 @@ func (tp *provider) TestAdd(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p := func(h string) coreiface.ResolvedPath {
@@ -566,15 +566,18 @@ func (tp *provider) TestAddPinned(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Unixfs().Add(ctx, strFile(helloStr)(), options.Unixfs.Pin(true))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	pins, err := api.Pin().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if len(pins) != 1 {
 		t.Fatalf("expected 1 pin, got %d", len(pins))
 	}
@@ -589,12 +592,12 @@ func (tp *provider) TestAddHashOnly(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	p, err := api.Unixfs().Add(ctx, strFile(helloStr)(), options.Unixfs.HashOnly(true))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if p.String() != hello {
@@ -648,18 +651,18 @@ func (tp *provider) TestGetDir(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	edir := unixfs.EmptyDirNode()
 	err = api.Dag().Add(ctx, edir)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	p := coreiface.IpfsPath(edir.Cid())
 
 	emptyDir, err := api.Object().New(ctx, options.Object.Type("unixfs-dir"))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if p.String() != coreiface.IpfsPath(emptyDir.Cid()).String() {
@@ -668,7 +671,7 @@ func (tp *provider) TestGetDir(t *testing.T) {
 
 	r, err := api.Unixfs().Get(ctx, coreiface.IpfsPath(emptyDir.Cid()))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if _, ok := r.(files.Directory); !ok {
@@ -681,13 +684,13 @@ func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd := new(mdag.ProtoNode)
 	err = api.Dag().Add(ctx, nd)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Unixfs().Get(ctx, coreiface.IpfsPath(nd.Cid()))
@@ -761,7 +764,7 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	r := strings.NewReader("content-of-file")
@@ -769,14 +772,14 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 		"name-of-file": files.NewReaderFile(r),
 	}))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	ctx, cancel = context.WithCancel(ctx)
 
 	nd, err := api.Unixfs().Get(ctx, p)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	cancel()
 
@@ -803,22 +806,22 @@ func (tp *provider) TestLsEmptyDir(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	_, err = api.Unixfs().Add(ctx, files.NewSliceDirectory([]files.DirEntry{}))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	emptyDir, err := api.Object().New(ctx, options.Object.Type("unixfs-dir"))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(emptyDir.Cid()))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if len(links) != 0 {
@@ -832,7 +835,7 @@ func (tp *provider) TestLsNonUnixfs(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	nd, err := cbor.WrapObject(map[string]interface{}{"foo": "bar"}, math.MaxUint64, -1)
@@ -842,12 +845,12 @@ func (tp *provider) TestLsNonUnixfs(t *testing.T) {
 
 	err = api.Dag().Add(ctx, nd)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(nd.Cid()))
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	if len(links) != 0 {
@@ -890,7 +893,7 @@ func (tp *provider) TestAddCloses(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	n4 := &closeTestF{files.NewBytesFile([]byte("foo")), false, t}
@@ -907,7 +910,7 @@ func (tp *provider) TestAddCloses(t *testing.T) {
 
 	_, err = api.Unixfs().Add(ctx, d0)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	d0.Close() // Adder doesn't close top-level file
@@ -930,7 +933,7 @@ func (tp *provider) TestGetSeek(t *testing.T) {
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	dataSize := int64(100000)

From 1f87fa6168ea5ffcba06e5fb0de0ad9324b8d09b Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 26 Mar 2019 18:35:13 +0000
Subject: [PATCH 207/247] tests: remove t.Fatal from goroutines

This commit was moved from ipfs/interface-go-ipfs-core@5f17f8346b441a6105b569084fa020af989b0f4c

This commit was moved from ipfs/boxo@ccb4a5c183b98b9dcf40eee0c0ac8e4a317b4ed8
---
 core/coreiface/tests/pubsub.go | 4 +++-
 core/coreiface/tests/unixfs.go | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index bb870de6c..dd05b73cf 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -40,7 +40,9 @@ func (tp *provider) TestBasicPubSub(t *testing.T) {
 		for {
 			err := apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
 			if err != nil {
-				t.Fatal(err)
+				t.Error(err)
+				cancel()
+				return
 			}
 			select {
 			case <-tick:
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index e99bf4429..576160500 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -423,11 +423,13 @@ func (tp *provider) TestAdd(t *testing.T) {
 					for evt := range eventOut {
 						event, ok := evt.(*coreiface.AddEvent)
 						if !ok {
-							t.Fatal("unexpected event type")
+							t.Error("unexpected event type")
+							continue
 						}
 
 						if len(expected) < 1 {
-							t.Fatal("got more events than expected")
+							t.Error("got more events than expected")
+							continue
 						}
 
 						if expected[0].Size != event.Size {
@@ -453,7 +455,7 @@ func (tp *provider) TestAdd(t *testing.T) {
 					}
 
 					if len(expected) > 0 {
-						t.Fatalf("%d event(s) didn't arrive", len(expected))
+						t.Errorf("%d event(s) didn't arrive", len(expected))
 					}
 				}()
 			}

From ba5e78a4c5de8bc560ba0579887f80aa47844419 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 26 Mar 2019 18:37:40 +0000
Subject: [PATCH 208/247] tests: remove ticker leak

This commit was moved from ipfs/interface-go-ipfs-core@a7d4a7199895a4bd66fa655b73f94ecea4540fdf

This commit was moved from ipfs/boxo@b75b1243fb9738e1b5eb6fd19bca980bd156299c
---
 core/coreiface/tests/pubsub.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index dd05b73cf..418fc4867 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -35,7 +35,8 @@ func (tp *provider) TestBasicPubSub(t *testing.T) {
 	}
 
 	go func() {
-		tick := time.Tick(100 * time.Millisecond)
+		ticker := time.NewTicker(100 * time.Millisecond)
+		defer ticker.Stop()
 
 		for {
 			err := apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
@@ -45,7 +46,7 @@ func (tp *provider) TestBasicPubSub(t *testing.T) {
 				return
 			}
 			select {
-			case <-tick:
+			case <-ticker.C:
 			case <-ctx.Done():
 				return
 			}

From adddfdf0f7f8c50957d4581c04db4711ddb4f925 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 26 Mar 2019 18:38:02 +0000
Subject: [PATCH 209/247] tests: fix unused variable lints

This commit was moved from ipfs/interface-go-ipfs-core@5d6a474f3191362120268fa1b0396823013fbe41

This commit was moved from ipfs/boxo@bbf450e3e44f7595a128eba9b7578a412ddcd551
---
 core/coreiface/tests/object.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 026def73b..8682a2edc 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -296,7 +296,7 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p3, err := api.Object().AddLink(ctx, p2, "abc/d", p2)
+	_, err = api.Object().AddLink(ctx, p2, "abc/d", p2)
 	if err == nil {
 		t.Fatal("expected an error")
 	}
@@ -304,7 +304,7 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err.Error())
 	}
 
-	p3, err = api.Object().AddLink(ctx, p2, "abc/d", p2, opt.Object.Create(true))
+	p3, err := api.Object().AddLink(ctx, p2, "abc/d", p2, opt.Object.Create(true))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -384,6 +384,9 @@ func (tp *provider) TestObjectAddData(t *testing.T) {
 	}
 
 	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	if string(data) != "foobar" {
 		t.Error("unexpected data")
@@ -414,6 +417,9 @@ func (tp *provider) TestObjectSetData(t *testing.T) {
 	}
 
 	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	if string(data) != "bar" {
 		t.Error("unexpected data")

From 6c4219a102a7cb05ec824fc035e01abe79b8e072 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 26 Mar 2019 19:01:23 +0000
Subject: [PATCH 210/247] don't close the top-level addr

See https://github.com/ipfs/go-ipfs-http-client/pull/10/files#r269268326


This commit was moved from ipfs/interface-go-ipfs-core@1b707f294336a6eaf3274e27ab0ce85a2b374fbe

This commit was moved from ipfs/boxo@21ade61b10b9757f9dfd2dafdb3c95a0ec00ccb1
---
 core/coreiface/tests/unixfs.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 0fd494f66..ea36b7330 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -834,6 +834,7 @@ type closeTestD struct {
 }
 
 func (f *closeTestD) Close() error {
+	f.t.Helper()
 	if f.closed {
 		f.t.Fatal("already closed")
 	}
@@ -874,8 +875,6 @@ func (tp *provider) TestAddCloses(t *testing.T) {
 		t.Error(err)
 	}
 
-	d0.Close() // Adder doesn't close top-level file
-
 	for i, n := range []*closeTestF{n1, n2, n4} {
 		if !n.closed {
 			t.Errorf("file %d not closed!", i)

From 686f55459c5747fac06c8b76810a371c9e635d9b Mon Sep 17 00:00:00 2001
From: Edgar Lee <edgarl@netflix.com>
Date: Fri, 29 Mar 2019 16:16:16 -0700
Subject: [PATCH 211/247] Update Pin.RmRecursive docs to clarify shared
 indirect pins are not removed

This commit was moved from ipfs/interface-go-ipfs-core@c908a059feab33b74ce66dca01fd521389372942

This commit was moved from ipfs/boxo@ea26ae5e0535dc2429c8c2797b79982317cc9bb3
---
 core/coreiface/options/pin.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index cc4a8ef29..6b211bb73 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -127,7 +127,9 @@ func (pinOpts) Recursive(recursive bool) PinAddOption {
 	}
 }
 
-// RmRecursive is an option for Pin.Rm
+// RmRecursive is an option for Pin.Rm which specifies whether to recursively
+// unpin the object linked to by the specified object(s). This does not remove
+// indirect pins referenced by other recursive pins.
 func (pinOpts) RmRecursive(recursive bool) PinRmOption {
 	return func(settings *PinRmSettings) error {
 		settings.Recursive = recursive

From 1a2e8ce6d76f9517240ca53339937d4e07dcfe96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 25 Mar 2019 17:03:44 +0100
Subject: [PATCH 212/247] path: drop error from ParsePath

This commit was moved from ipfs/interface-go-ipfs-core@2b9bff7523c812447641aa70c39ec0b096f5b5c4

This commit was moved from ipfs/boxo@31071e1f5e59a62d53e2c2c7e259eedff6d49f6f
---
 core/coreiface/path.go | 51 +++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 4e86172ac..ede190df7 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,9 @@
 package iface
 
 import (
-	"github.com/ipfs/go-cid"
+	"strings"
+
+	cid "github.com/ipfs/go-cid"
 	ipfspath "github.com/ipfs/go-path"
 )
 
@@ -23,6 +25,9 @@ type Path interface {
 	// Namespace returns the first component of the path.
 	//
 	// For example path "/ipfs/QmHash", calling Namespace() will return "ipfs"
+	//
+	// Calling this method on invalid paths (IsValid() != nil) will result in
+	// empty string
 	Namespace() string
 
 	// Mutable returns false if the data pointed to by this path in guaranteed
@@ -30,9 +35,14 @@ type Path interface {
 	//
 	// Note that resolved mutable path can be immutable.
 	Mutable() bool
+
+	// IsValid checks if this path is a valid ipfs Path, returning nil iff it is
+	// valid
+	IsValid() error
 }
 
-// ResolvedPath is a path which was resolved to the last resolvable node
+// ResolvedPath is a path which was resolved to the last resolvable node.
+// ResolvedPaths are guaranteed to return nil from `IsValid`
 type ResolvedPath interface {
 	// Cid returns the CID of the node referenced by the path. Remainder of the
 	// path is guaranteed to be within the node.
@@ -94,7 +104,7 @@ type ResolvedPath interface {
 
 // path implements coreiface.Path
 type path struct {
-	path ipfspath.Path
+	path string
 }
 
 // resolvedPath implements coreiface.resolvedPath
@@ -107,14 +117,14 @@ type resolvedPath struct {
 
 // Join appends provided segments to the base path
 func Join(base Path, a ...string) Path {
-	s := ipfspath.Join(append([]string{base.String()}, a...))
-	return &path{path: ipfspath.FromString(s)}
+	s := strings.Join(append([]string{base.String()}, a...), "/")
+	return &path{path: s}
 }
 
 // IpfsPath creates new /ipfs path from the provided CID
 func IpfsPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
-		path:      path{ipfspath.Path("/ipfs/" + c.String())},
+		path:      path{"/ipfs/" + c.String()},
 		cid:       c,
 		root:      c,
 		remainder: "",
@@ -124,7 +134,7 @@ func IpfsPath(c cid.Cid) ResolvedPath {
 // IpldPath creates new /ipld path from the provided CID
 func IpldPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
-		path:      path{ipfspath.Path("/ipld/" + c.String())},
+		path:      path{"/ipld/" + c.String()},
 		cid:       c,
 		root:      c,
 		remainder: "",
@@ -132,13 +142,12 @@ func IpldPath(c cid.Cid) ResolvedPath {
 }
 
 // ParsePath parses string path to a Path
-func ParsePath(p string) (Path, error) {
-	pp, err := ipfspath.ParsePath(p)
-	if err != nil {
-		return nil, err
+func ParsePath(p string) Path {
+	if pp, err := ipfspath.ParsePath(p); err == nil {
+		p = pp.String()
 	}
 
-	return &path{path: pp}, nil
+	return &path{path: p}
 }
 
 // NewResolvedPath creates new ResolvedPath. This function performs no checks
@@ -146,7 +155,7 @@ func ParsePath(p string) (Path, error) {
 // cause panics. Handle with care.
 func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
 	return &resolvedPath{
-		path:      path{ipath},
+		path:      path{ipath.String()},
 		cid:       c,
 		root:      root,
 		remainder: remainder,
@@ -154,14 +163,19 @@ func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder str
 }
 
 func (p *path) String() string {
-	return p.path.String()
+	return p.path
 }
 
 func (p *path) Namespace() string {
-	if len(p.path.Segments()) < 1 {
+	ip, err := ipfspath.ParsePath(p.path)
+	if err != nil {
+		return ""
+	}
+
+	if len(ip.Segments()) < 1 {
 		panic("path without namespace") //this shouldn't happen under any scenario
 	}
-	return p.path.Segments()[0]
+	return ip.Segments()[0]
 }
 
 func (p *path) Mutable() bool {
@@ -169,6 +183,11 @@ func (p *path) Mutable() bool {
 	return p.Namespace() == "ipns"
 }
 
+func (p *path) IsValid() error {
+	_, err := ipfspath.ParsePath(p.path)
+	return err
+}
+
 func (p *resolvedPath) Cid() cid.Cid {
 	return p.cid
 }

From aca6f61a63b790c779744a6cca8d058ac6388973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 25 Mar 2019 17:03:53 +0100
Subject: [PATCH 213/247] path: fix tests

This commit was moved from ipfs/interface-go-ipfs-core@33d445a6140b26da90a07d2bf86c8827d74284b6

This commit was moved from ipfs/boxo@1497150b1f90816ac7b117fbe0b2fb6aacaa7968
---
 core/coreiface/tests/block.go  |  5 +----
 core/coreiface/tests/dag.go    |  5 +----
 core/coreiface/tests/name.go   |  6 +-----
 core/coreiface/tests/path.go   | 33 +++++----------------------------
 core/coreiface/tests/unixfs.go |  5 +----
 5 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index d584ac98a..96319b488 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -110,10 +110,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 		t.Error("didn't get correct data back")
 	}
 
-	p, err := coreiface.ParsePath("/ipfs/" + res.Path().Cid().String())
-	if err != nil {
-		t.Fatal(err)
-	}
+	p := coreiface.ParsePath("/ipfs/" + res.Path().Cid().String())
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index ff034beec..a17296d1d 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -113,10 +113,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p, err := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	p := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 1eb2dd513..c9e99a584 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -35,11 +35,7 @@ func addTestObject(ctx context.Context, api coreiface.CoreAPI) (coreiface.Path,
 }
 
 func appendPath(p coreiface.Path, sub string) coreiface.Path {
-	p, err := coreiface.ParsePath(path.Join(p.String(), sub))
-	if err != nil {
-		panic(err)
-	}
-	return p
+	return coreiface.ParsePath(path.Join(p.String(), sub))
 }
 
 func (tp *provider) TestPublishResolve(t *testing.T) {
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index b99e8ab9c..f5b0ee348 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -75,12 +75,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(nd.String() + "/foo/bar")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	rp1, err := api.ResolvePath(ctx, p1)
+	rp1, err := api.ResolvePath(ctx, coreiface.ParsePath(nd.String()+"/foo/bar"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -111,12 +106,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath(nd.Cid().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	rp1, err := api.ResolvePath(ctx, p1)
+	rp1, err := api.ResolvePath(ctx, coreiface.ParsePath(nd.Cid().String()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -147,12 +137,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/bar/baz")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = api.ResolvePath(ctx, p1)
+	_, err = api.ResolvePath(ctx, coreiface.ParsePath("/ipld/"+nd.Cid().String()+"/bar/baz"))
 	if err == nil || !strings.Contains(err.Error(), "no such link found") {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -188,12 +173,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/foo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	rp, err := api.ResolvePath(ctx, p1)
+	rp, err := api.ResolvePath(ctx, coreiface.ParsePath("/ipld/"+nd.Cid().String()+"/foo"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -208,10 +188,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 }
 
 func (tp *provider) TestPathJoin(t *testing.T) {
-	p1, err := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
-	if err != nil {
-		t.Fatal(err)
-	}
+	p1 := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
 
 	if coreiface.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
 		t.Error("unexpected path")
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 611ea5476..15cb8abc8 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -592,10 +592,7 @@ func (tp *provider) TestGetEmptyFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	emptyFilePath, err := coreiface.ParsePath(emptyFile)
-	if err != nil {
-		t.Fatal(err)
-	}
+	emptyFilePath := coreiface.ParsePath(emptyFile)
 
 	r, err := api.Unixfs().Get(ctx, emptyFilePath)
 	if err != nil {

From 51a937fffd45edbc0543fe4a2338b6034e5ea2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 25 Mar 2019 19:37:28 +0100
Subject: [PATCH 214/247] path: WIP

This commit was moved from ipfs/interface-go-ipfs-core@5a836515396273412794edaaba72ef0cf3ead46d

This commit was moved from ipfs/boxo@b8463e7c123e4ff15fd8fdd33a02a6414682ca9a
---
 core/coreiface/block.go        |  11 +-
 core/coreiface/coreapi.go      |   5 +-
 core/coreiface/dht.go          |   7 +-
 core/coreiface/key.go          |   5 +-
 core/coreiface/name.go         |  11 +-
 core/coreiface/object.go       |  29 ++---
 core/coreiface/path.go         | 197 --------------------------------
 core/coreiface/path/path.go    | 199 +++++++++++++++++++++++++++++++++
 core/coreiface/pin.go          |  13 ++-
 core/coreiface/tests/block.go  |   3 +-
 core/coreiface/tests/dag.go    |   5 +-
 core/coreiface/tests/name.go   |  12 +-
 core/coreiface/tests/path.go   |  14 +--
 core/coreiface/tests/pin.go    |  13 ++-
 core/coreiface/tests/unixfs.go |  19 ++--
 core/coreiface/unixfs.go       |  17 +--
 16 files changed, 287 insertions(+), 273 deletions(-)
 create mode 100644 core/coreiface/path/path.go

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index 587ad339f..9f0ad9cbb 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/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)
 }
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index f3433c089..bef3ce01f 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/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
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index d1ae05125..0cb7893ef 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/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
 }
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 78c29d268..e7fb3f442 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/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
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 51b005b7e..3dc9f6878 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/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
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 4f9652fb1..3e4b7e087 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/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)
 }
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index ede190df7..198651129 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,201 +1,4 @@
 package iface
 
-import (
-	"strings"
-
-	cid "github.com/ipfs/go-cid"
-	ipfspath "github.com/ipfs/go-path"
-)
-
 //TODO: merge with ipfspath so we don't depend on it
 
-// Path is a generic wrapper for paths used in the API. A path can be resolved
-// to a CID using one of Resolve functions in the API.
-//
-// Paths must be prefixed with a valid prefix:
-//
-// * /ipfs - Immutable unixfs path (files)
-// * /ipld - Immutable ipld path (data)
-// * /ipns - Mutable names. Usually resolves to one of the immutable paths
-//TODO: /local (MFS)
-type Path interface {
-	// String returns the path as a string.
-	String() string
-
-	// Namespace returns the first component of the path.
-	//
-	// For example path "/ipfs/QmHash", calling Namespace() will return "ipfs"
-	//
-	// Calling this method on invalid paths (IsValid() != nil) will result in
-	// empty string
-	Namespace() string
-
-	// Mutable returns false if the data pointed to by this path in guaranteed
-	// to not change.
-	//
-	// Note that resolved mutable path can be immutable.
-	Mutable() bool
-
-	// IsValid checks if this path is a valid ipfs Path, returning nil iff it is
-	// valid
-	IsValid() error
-}
-
-// ResolvedPath is a path which was resolved to the last resolvable node.
-// ResolvedPaths are guaranteed to return nil from `IsValid`
-type ResolvedPath interface {
-	// Cid returns the CID of the node referenced by the path. Remainder of the
-	// path is guaranteed to be within the node.
-	//
-	// Examples:
-	// If you have 3 linked objects: QmRoot -> A -> B:
-	//
-	// cidB := {"foo": {"bar": 42 }}
-	// cidA := {"B": {"/": cidB }}
-	// cidRoot := {"A": {"/": cidA }}
-	//
-	// And resolve paths:
-	//
-	// * "/ipfs/${cidRoot}"
-	//   * Calling Cid() will return `cidRoot`
-	//   * Calling Root() will return `cidRoot`
-	//   * Calling Remainder() will return ``
-	//
-	// * "/ipfs/${cidRoot}/A"
-	//   * Calling Cid() will return `cidA`
-	//   * Calling Root() will return `cidRoot`
-	//   * Calling Remainder() will return ``
-	//
-	// * "/ipfs/${cidRoot}/A/B/foo"
-	//   * Calling Cid() will return `cidB`
-	//   * Calling Root() will return `cidRoot`
-	//   * Calling Remainder() will return `foo`
-	//
-	// * "/ipfs/${cidRoot}/A/B/foo/bar"
-	//   * Calling Cid() will return `cidB`
-	//   * Calling Root() will return `cidRoot`
-	//   * Calling Remainder() will return `foo/bar`
-	Cid() cid.Cid
-
-	// Root returns the CID of the root object of the path
-	//
-	// Example:
-	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
-	// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
-	//
-	// For more examples see the documentation of Cid() method
-	Root() cid.Cid
-
-	// Remainder returns unresolved part of the path
-	//
-	// Example:
-	// If you have 2 linked objects: QmRoot -> A, where A is a CBOR node
-	// containing the following data:
-	//
-	// {"foo": {"bar": 42 }}
-	//
-	// When resolving "/ipld/QmRoot/A/foo/bar", Remainder will return "foo/bar"
-	//
-	// For more examples see the documentation of Cid() method
-	Remainder() string
-
-	Path
-}
-
-// path implements coreiface.Path
-type path struct {
-	path string
-}
-
-// resolvedPath implements coreiface.resolvedPath
-type resolvedPath struct {
-	path
-	cid       cid.Cid
-	root      cid.Cid
-	remainder string
-}
-
-// Join appends provided segments to the base path
-func Join(base Path, a ...string) Path {
-	s := strings.Join(append([]string{base.String()}, a...), "/")
-	return &path{path: s}
-}
-
-// IpfsPath creates new /ipfs path from the provided CID
-func IpfsPath(c cid.Cid) ResolvedPath {
-	return &resolvedPath{
-		path:      path{"/ipfs/" + c.String()},
-		cid:       c,
-		root:      c,
-		remainder: "",
-	}
-}
-
-// IpldPath creates new /ipld path from the provided CID
-func IpldPath(c cid.Cid) ResolvedPath {
-	return &resolvedPath{
-		path:      path{"/ipld/" + c.String()},
-		cid:       c,
-		root:      c,
-		remainder: "",
-	}
-}
-
-// ParsePath parses string path to a Path
-func ParsePath(p string) Path {
-	if pp, err := ipfspath.ParsePath(p); err == nil {
-		p = pp.String()
-	}
-
-	return &path{path: p}
-}
-
-// NewResolvedPath creates new ResolvedPath. This function performs no checks
-// and is intended to be used by resolver implementations. Incorrect inputs may
-// cause panics. Handle with care.
-func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
-	return &resolvedPath{
-		path:      path{ipath.String()},
-		cid:       c,
-		root:      root,
-		remainder: remainder,
-	}
-}
-
-func (p *path) String() string {
-	return p.path
-}
-
-func (p *path) Namespace() string {
-	ip, err := ipfspath.ParsePath(p.path)
-	if err != nil {
-		return ""
-	}
-
-	if len(ip.Segments()) < 1 {
-		panic("path without namespace") //this shouldn't happen under any scenario
-	}
-	return ip.Segments()[0]
-}
-
-func (p *path) Mutable() bool {
-	//TODO: MFS: check for /local
-	return p.Namespace() == "ipns"
-}
-
-func (p *path) IsValid() error {
-	_, err := ipfspath.ParsePath(p.path)
-	return err
-}
-
-func (p *resolvedPath) Cid() cid.Cid {
-	return p.cid
-}
-
-func (p *resolvedPath) Root() cid.Cid {
-	return p.root
-}
-
-func (p *resolvedPath) Remainder() string {
-	return p.remainder
-}
diff --git a/core/coreiface/path/path.go b/core/coreiface/path/path.go
new file mode 100644
index 000000000..414d454fa
--- /dev/null
+++ b/core/coreiface/path/path.go
@@ -0,0 +1,199 @@
+package path
+
+import (
+	"strings"
+
+	cid "github.com/ipfs/go-cid"
+	ipfspath "github.com/ipfs/go-path"
+)
+
+// Path is a generic wrapper for paths used in the API. A path can be resolved
+// to a CID using one of Resolve functions in the API.
+//
+// Paths must be prefixed with a valid prefix:
+//
+// * /ipfs - Immutable unixfs path (files)
+// * /ipld - Immutable ipld path (data)
+// * /ipns - Mutable names. Usually resolves to one of the immutable paths
+//TODO: /local (MFS)
+type Path interface {
+	// String returns the path as a string.
+	String() string
+
+	// Namespace returns the first component of the path.
+	//
+	// For example path "/ipfs/QmHash", calling Namespace() will return "ipfs"
+	//
+	// Calling this method on invalid paths (IsValid() != nil) will result in
+	// empty string
+	Namespace() string
+
+	// Mutable returns false if the data pointed to by this path in guaranteed
+	// to not change.
+	//
+	// Note that resolved mutable path can be immutable.
+	Mutable() bool
+
+	// IsValid checks if this path is a valid ipfs Path, returning nil iff it is
+	// valid
+	IsValid() error
+}
+
+// ResolvedPath is a path which was resolved to the last resolvable node.
+// ResolvedPaths are guaranteed to return nil from `IsValid`
+type ResolvedPath interface {
+	// Cid returns the CID of the node referenced by the path. Remainder of the
+	// path is guaranteed to be within the node.
+	//
+	// Examples:
+	// If you have 3 linked objects: QmRoot -> A -> B:
+	//
+	// cidB := {"foo": {"bar": 42 }}
+	// cidA := {"B": {"/": cidB }}
+	// cidRoot := {"A": {"/": cidA }}
+	//
+	// And resolve paths:
+	//
+	// * "/ipfs/${cidRoot}"
+	//   * Calling Cid() will return `cidRoot`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return ``
+	//
+	// * "/ipfs/${cidRoot}/A"
+	//   * Calling Cid() will return `cidA`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return ``
+	//
+	// * "/ipfs/${cidRoot}/A/B/foo"
+	//   * Calling Cid() will return `cidB`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return `foo`
+	//
+	// * "/ipfs/${cidRoot}/A/B/foo/bar"
+	//   * Calling Cid() will return `cidB`
+	//   * Calling Root() will return `cidRoot`
+	//   * Calling Remainder() will return `foo/bar`
+	Cid() cid.Cid
+
+	// Root returns the CID of the root object of the path
+	//
+	// Example:
+	// If you have 3 linked objects: QmRoot -> A -> B, and resolve path
+	// "/ipfs/QmRoot/A/B", the Root method will return the CID of object QmRoot
+	//
+	// For more examples see the documentation of Cid() method
+	Root() cid.Cid
+
+	// Remainder returns unresolved part of the path
+	//
+	// Example:
+	// If you have 2 linked objects: QmRoot -> A, where A is a CBOR node
+	// containing the following data:
+	//
+	// {"foo": {"bar": 42 }}
+	//
+	// When resolving "/ipld/QmRoot/A/foo/bar", Remainder will return "foo/bar"
+	//
+	// For more examples see the documentation of Cid() method
+	Remainder() string
+
+	Path
+}
+
+// path implements coreiface.Path
+type path struct {
+	path string
+}
+
+// resolvedPath implements coreiface.resolvedPath
+type resolvedPath struct {
+	path
+	cid       cid.Cid
+	root      cid.Cid
+	remainder string
+}
+
+// Join appends provided segments to the base path
+func Join(base Path, a ...string) Path {
+	s := strings.Join(append([]string{base.String()}, a...), "/")
+	return &path{path: s}
+}
+
+// IpfsPath creates new /ipfs path from the provided CID
+func IpfsPath(c cid.Cid) ResolvedPath {
+	return &resolvedPath{
+		path:      path{"/ipfs/" + c.String()},
+		cid:       c,
+		root:      c,
+		remainder: "",
+	}
+}
+
+// IpldPath creates new /ipld path from the provided CID
+func IpldPath(c cid.Cid) ResolvedPath {
+	return &resolvedPath{
+		path:      path{"/ipld/" + c.String()},
+		cid:       c,
+		root:      c,
+		remainder: "",
+	}
+}
+
+// ParsePath parses string path to a Path
+func ParsePath(p string) Path {
+	if pp, err := ipfspath.ParsePath(p); err == nil {
+		p = pp.String()
+	}
+
+	return &path{path: p}
+}
+
+// NewResolvedPath creates new ResolvedPath. This function performs no checks
+// and is intended to be used by resolver implementations. Incorrect inputs may
+// cause panics. Handle with care.
+func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
+	return &resolvedPath{
+		path:      path{ipath.String()},
+		cid:       c,
+		root:      root,
+		remainder: remainder,
+	}
+}
+
+func (p *path) String() string {
+	return p.path
+}
+
+func (p *path) Namespace() string {
+	ip, err := ipfspath.ParsePath(p.path)
+	if err != nil {
+		return ""
+	}
+
+	if len(ip.Segments()) < 1 {
+		panic("path without namespace") // this shouldn't happen under any scenario
+	}
+	return ip.Segments()[0]
+}
+
+func (p *path) Mutable() bool {
+	// TODO: MFS: check for /local
+	return p.Namespace() == "ipns"
+}
+
+func (p *path) IsValid() error {
+	_, err := ipfspath.ParsePath(p.path)
+	return err
+}
+
+func (p *resolvedPath) Cid() cid.Cid {
+	return p.cid
+}
+
+func (p *resolvedPath) Root() cid.Cid {
+	return p.root
+}
+
+func (p *resolvedPath) Remainder() string {
+	return p.remainder
+}
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 6a7dab413..736b2d68b 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -2,14 +2,15 @@ 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"
 )
 
 // Pin holds information about pinned resource
 type Pin interface {
 	// Path to the pinned object
-	Path() ResolvedPath
+	Path() path.ResolvedPath
 
 	// Type of the pin
 	Type() string
@@ -27,7 +28,7 @@ type PinStatus interface {
 // BadPinNode is a node that has been marked as bad by Pin.Verify
 type BadPinNode interface {
 	// Path is the path of the node
-	Path() ResolvedPath
+	Path() path.ResolvedPath
 
 	// Err is the reason why the node has been marked as bad
 	Err() error
@@ -37,17 +38,17 @@ type BadPinNode interface {
 type PinAPI interface {
 	// Add creates new pin, be default recursive - pinning the whole referenced
 	// tree
-	Add(context.Context, Path, ...options.PinAddOption) error
+	Add(context.Context, path.Path, ...options.PinAddOption) error
 
 	// Ls returns list of pinned objects on this node
 	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
 
 	// Rm removes pin for object specified by the path
-	Rm(context.Context, Path, ...options.PinRmOption) error
+	Rm(context.Context, path.Path, ...options.PinRmOption) error
 
 	// Update changes one pin to another, skipping checks for matching paths in
 	// the old tree
-	Update(ctx context.Context, from Path, to Path, opts ...options.PinUpdateOption) error
+	Update(ctx context.Context, from path.Path, to path.Path, opts ...options.PinUpdateOption) error
 
 	// Verify verifies the integrity of pinned objects
 	Verify(context.Context) (<-chan PinStatus, error)
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 96319b488..59b49d567 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -2,6 +2,7 @@ package tests
 
 import (
 	"context"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 	"io/ioutil"
 	"strings"
 	"testing"
@@ -110,7 +111,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 		t.Error("didn't get correct data back")
 	}
 
-	p := coreiface.ParsePath("/ipfs/" + res.Path().Cid().String())
+	p := path.ParsePath("/ipfs/" + res.Path().Cid().String())
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index a17296d1d..0abcee32f 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -2,8 +2,9 @@ package tests
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
-	"path"
+	gopath "path"
 	"strings"
 	"testing"
 
@@ -113,7 +114,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
+	p := path.ParsePath(gopath.Join(nd.Cid().String(), "lnk"))
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index c9e99a584..98ae6853e 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -2,9 +2,10 @@ package tests
 
 import (
 	"context"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 	"math/rand"
-	"path"
+	gopath "path"
 	"testing"
 	"time"
 
@@ -30,18 +31,18 @@ func (tp *provider) TestName(t *testing.T) {
 
 var rnd = rand.New(rand.NewSource(0x62796532303137))
 
-func addTestObject(ctx context.Context, api coreiface.CoreAPI) (coreiface.Path, error) {
+func addTestObject(ctx context.Context, api coreiface.CoreAPI) (path.Path, error) {
 	return api.Unixfs().Add(ctx, files.NewReaderFile(&io.LimitedReader{R: rnd, N: 4092}))
 }
 
-func appendPath(p coreiface.Path, sub string) coreiface.Path {
-	return coreiface.ParsePath(path.Join(p.String(), sub))
+func appendPath(p path.Path, sub string) path.Path {
+	return path.ParsePath(gopath.Join(p.String(), sub))
 }
 
 func (tp *provider) TestPublishResolve(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	init := func() (coreiface.CoreAPI, coreiface.Path) {
+	init := func() (coreiface.CoreAPI, path.Path) {
 		apis, err := tp.MakeAPISwarm(ctx, true, 5)
 		if err != nil {
 			t.Fatal(err)
@@ -56,7 +57,6 @@ func (tp *provider) TestPublishResolve(t *testing.T) {
 		}
 		return api, p
 	}
-
 	run := func(t *testing.T, ropts []opt.NameResolveOption) {
 		t.Run("basic", func(t *testing.T) {
 			api, p := init()
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index f5b0ee348..685f46998 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -2,11 +2,11 @@ package tests
 
 import (
 	"context"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
@@ -75,7 +75,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp1, err := api.ResolvePath(ctx, coreiface.ParsePath(nd.String()+"/foo/bar"))
+	rp1, err := api.ResolvePath(ctx, path.ParsePath(nd.String()+"/foo/bar"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -106,7 +106,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp1, err := api.ResolvePath(ctx, coreiface.ParsePath(nd.Cid().String()))
+	rp1, err := api.ResolvePath(ctx, path.ParsePath(nd.Cid().String()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -137,7 +137,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = api.ResolvePath(ctx, coreiface.ParsePath("/ipld/"+nd.Cid().String()+"/bar/baz"))
+	_, err = api.ResolvePath(ctx, path.ParsePath("/ipld/"+nd.Cid().String()+"/bar/baz"))
 	if err == nil || !strings.Contains(err.Error(), "no such link found") {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -173,7 +173,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp, err := api.ResolvePath(ctx, coreiface.ParsePath("/ipld/"+nd.Cid().String()+"/foo"))
+	rp, err := api.ResolvePath(ctx, path.ParsePath("/ipld/"+nd.Cid().String()+"/foo"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -188,9 +188,9 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 }
 
 func (tp *provider) TestPathJoin(t *testing.T) {
-	p1 := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
+	p1 := path.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
 
-	if coreiface.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
+	if path.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
 		t.Error("unexpected path")
 	}
 }
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index ff6f98e35..344db65e2 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -2,6 +2,7 @@ package tests
 
 import (
 	"context"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	"strings"
 	"testing"
@@ -127,12 +128,12 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = api.Pin().Add(ctx, iface.IpldPath(nd2.Cid()))
+	err = api.Pin().Add(ctx, path.IpldPath(nd2.Cid()))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = api.Pin().Add(ctx, iface.IpldPath(nd3.Cid()), opt.Pin.Recursive(false))
+	err = api.Pin().Add(ctx, path.IpldPath(nd3.Cid()), opt.Pin.Recursive(false))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,8 +156,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != iface.IpldPath(nd3.Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2.Cid()).String())
+	if list[0].Path().String() != path.IpldPath(nd3.Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpfsPath(nd2.Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
@@ -168,8 +169,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	if list[0].Path().String() != iface.IpldPath(nd2.Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3.Cid()).String())
+	if list[0].Path().String() != path.IpldPath(nd2.Cid()).String() {
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpldPath(nd3.Cid()).String())
 	}
 
 	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 15cb8abc8..d2d9f85b8 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 	"io/ioutil"
 	"math"
@@ -101,12 +102,12 @@ func (tp *provider) TestAdd(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := func(h string) coreiface.ResolvedPath {
+	p := func(h string) path.ResolvedPath {
 		c, err := cid.Parse(h)
 		if err != nil {
 			t.Fatal(err)
 		}
-		return coreiface.IpfsPath(c)
+		return path.IpfsPath(c)
 	}
 
 	rf, err := ioutil.TempFile(os.TempDir(), "unixfs-add-real")
@@ -592,7 +593,7 @@ func (tp *provider) TestGetEmptyFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	emptyFilePath := coreiface.ParsePath(emptyFile)
+	emptyFilePath := path.ParsePath(emptyFile)
 
 	r, err := api.Unixfs().Get(ctx, emptyFilePath)
 	if err != nil {
@@ -621,18 +622,18 @@ func (tp *provider) TestGetDir(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	p := coreiface.IpfsPath(edir.Cid())
+	p := path.IpfsPath(edir.Cid())
 
 	emptyDir, err := api.Object().New(ctx, options.Object.Type("unixfs-dir"))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if p.String() != coreiface.IpfsPath(emptyDir.Cid()).String() {
+	if p.String() != path.IpfsPath(emptyDir.Cid()).String() {
 		t.Fatalf("expected path %s, got: %s", emptyDir.Cid(), p.String())
 	}
 
-	r, err := api.Unixfs().Get(ctx, coreiface.IpfsPath(emptyDir.Cid()))
+	r, err := api.Unixfs().Get(ctx, path.IpfsPath(emptyDir.Cid()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -656,7 +657,7 @@ func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = api.Unixfs().Get(ctx, coreiface.IpfsPath(nd.Cid()))
+	_, err = api.Unixfs().Get(ctx, path.IpfsPath(nd.Cid()))
 	if !strings.Contains(err.Error(), "proto: required field") {
 		t.Fatalf("expected protobuf error, got: %s", err)
 	}
@@ -782,7 +783,7 @@ func (tp *provider) TestLsEmptyDir(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(emptyDir.Cid()))
+	links, err := api.Unixfs().Ls(ctx, path.IpfsPath(emptyDir.Cid()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -811,7 +812,7 @@ func (tp *provider) TestLsNonUnixfs(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	links, err := api.Unixfs().Ls(ctx, coreiface.IpfsPath(nd.Cid()))
+	links, err := api.Unixfs().Ls(ctx, path.IpfsPath(nd.Cid()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index f9508f138..0b27519f3 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -3,16 +3,17 @@ package iface
 import (
 	"context"
 	"github.com/ipfs/interface-go-ipfs-core/options"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
 
-	cid "github.com/ipfs/go-cid"
-	files "github.com/ipfs/go-ipfs-files"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-ipfs-files"
 )
 
 type AddEvent struct {
 	Name  string
-	Path  ResolvedPath `json:",omitempty"`
-	Bytes int64        `json:",omitempty"`
-	Size  string       `json:",omitempty"`
+	Path  path.ResolvedPath `json:",omitempty"`
+	Bytes int64              `json:",omitempty"`
+	Size  string             `json:",omitempty"`
 }
 
 // FileType is an enum of possible UnixFS file types.
@@ -64,15 +65,15 @@ type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
 	//
 	// TODO: a long useful comment on how to use this for many different scenarios
-	Add(context.Context, files.Node, ...options.UnixfsAddOption) (ResolvedPath, error)
+	Add(context.Context, files.Node, ...options.UnixfsAddOption) (path.ResolvedPath, error)
 
 	// Get returns a read-only handle to a file tree referenced by a path
 	//
 	// Note that some implementations of this API may apply the specified context
 	// to operations performed on the returned file
-	Get(context.Context, Path) (files.Node, error)
+	Get(context.Context, path.Path) (files.Node, error)
 
 	// Ls returns the list of links in a directory. Links aren't guaranteed to be
 	// returned in order
-	Ls(context.Context, Path, ...options.UnixfsLsOption) (<-chan DirEntry, error)
+	Ls(context.Context, path.Path, ...options.UnixfsLsOption) (<-chan DirEntry, error)
 }

From 3669a774ffa2b3c545baf3f80f77c6d792295e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 26 Mar 2019 15:09:08 +0100
Subject: [PATCH 215/247] path: rename ParsePath and ResolvedPath

This commit was moved from ipfs/interface-go-ipfs-core@21a72398d98125cae4fcef33cc80ed4a1f3be22c

This commit was moved from ipfs/boxo@fbc9ab8769cbaac70a6459c33973c0d894e85126
---
 core/coreiface/block.go        |  2 +-
 core/coreiface/coreapi.go      |  2 +-
 core/coreiface/object.go       | 14 +++++++-------
 core/coreiface/path.go         |  4 ----
 core/coreiface/path/path.go    | 16 ++++++++--------
 core/coreiface/pin.go          |  4 ++--
 core/coreiface/tests/block.go  |  2 +-
 core/coreiface/tests/dag.go    |  2 +-
 core/coreiface/tests/name.go   |  2 +-
 core/coreiface/tests/path.go   | 10 +++++-----
 core/coreiface/tests/unixfs.go |  4 ++--
 core/coreiface/unixfs.go       |  8 ++++----
 12 files changed, 33 insertions(+), 37 deletions(-)
 delete mode 100644 core/coreiface/path.go

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index 9f0ad9cbb..b105b079d 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -14,7 +14,7 @@ type BlockStat interface {
 	Size() int
 
 	// Path returns path to the block
-	Path() path.ResolvedPath
+	Path() path.Resolved
 }
 
 // BlockAPI specifies the interface to the block layer
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index bef3ce01f..12cb166a8 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -44,7 +44,7 @@ type CoreAPI interface {
 	PubSub() PubSubAPI
 
 	// ResolvePath resolves the path using Unixfs resolver
-	ResolvePath(context.Context, path.Path) (path.ResolvedPath, error)
+	ResolvePath(context.Context, path.Path) (path.Resolved, error)
 
 	// ResolveNode resolves the path (if not resolved already) using Unixfs
 	// resolver, gets and returns the resolved Node
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 3e4b7e087..86536d421 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -59,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 path.ResolvedPath
+	Before path.Resolved
 
 	// After holds the link path after the change. Note that when a link is
 	// removed, this will be nil.
-	After path.ResolvedPath
+	After path.Resolved
 }
 
 // ObjectAPI specifies the interface to MerkleDAG and contains useful utilities
@@ -73,7 +73,7 @@ type ObjectAPI interface {
 	New(context.Context, ...options.ObjectNewOption) (ipld.Node, error)
 
 	// Put imports the data into merkledag
-	Put(context.Context, io.Reader, ...options.ObjectPutOption) (path.ResolvedPath, error)
+	Put(context.Context, io.Reader, ...options.ObjectPutOption) (path.Resolved, error)
 
 	// Get returns the node for the path
 	Get(context.Context, path.Path) (ipld.Node, error)
@@ -90,16 +90,16 @@ type ObjectAPI interface {
 	// 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.Path, name string, child path.Path, opts ...options.ObjectAddLinkOption) (path.ResolvedPath, error)
+	AddLink(ctx context.Context, base path.Path, name string, child path.Path, opts ...options.ObjectAddLinkOption) (path.Resolved, error)
 
 	// RmLink removes a link from the node
-	RmLink(ctx context.Context, base path.Path, link string) (path.ResolvedPath, error)
+	RmLink(ctx context.Context, base path.Path, link string) (path.Resolved, error)
 
 	// AppendData appends data to the node
-	AppendData(context.Context, path.Path, io.Reader) (path.ResolvedPath, error)
+	AppendData(context.Context, path.Path, io.Reader) (path.Resolved, error)
 
 	// SetData sets the data contained in the node
-	SetData(context.Context, path.Path, io.Reader) (path.ResolvedPath, error)
+	SetData(context.Context, path.Path, io.Reader) (path.Resolved, error)
 
 	// Diff returns a set of changes needed to transform the first object into the
 	// second.
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
deleted file mode 100644
index 198651129..000000000
--- a/core/coreiface/path.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package iface
-
-//TODO: merge with ipfspath so we don't depend on it
-
diff --git a/core/coreiface/path/path.go b/core/coreiface/path/path.go
index 414d454fa..01b1673b1 100644
--- a/core/coreiface/path/path.go
+++ b/core/coreiface/path/path.go
@@ -39,9 +39,9 @@ type Path interface {
 	IsValid() error
 }
 
-// ResolvedPath is a path which was resolved to the last resolvable node.
+// Resolved is a path which was resolved to the last resolvable node.
 // ResolvedPaths are guaranteed to return nil from `IsValid`
-type ResolvedPath interface {
+type Resolved interface {
 	// Cid returns the CID of the node referenced by the path. Remainder of the
 	// path is guaranteed to be within the node.
 	//
@@ -120,7 +120,7 @@ func Join(base Path, a ...string) Path {
 }
 
 // IpfsPath creates new /ipfs path from the provided CID
-func IpfsPath(c cid.Cid) ResolvedPath {
+func IpfsPath(c cid.Cid) Resolved {
 	return &resolvedPath{
 		path:      path{"/ipfs/" + c.String()},
 		cid:       c,
@@ -130,7 +130,7 @@ func IpfsPath(c cid.Cid) ResolvedPath {
 }
 
 // IpldPath creates new /ipld path from the provided CID
-func IpldPath(c cid.Cid) ResolvedPath {
+func IpldPath(c cid.Cid) Resolved {
 	return &resolvedPath{
 		path:      path{"/ipld/" + c.String()},
 		cid:       c,
@@ -139,8 +139,8 @@ func IpldPath(c cid.Cid) ResolvedPath {
 	}
 }
 
-// ParsePath parses string path to a Path
-func ParsePath(p string) Path {
+// New parses string path to a Path
+func New(p string) Path {
 	if pp, err := ipfspath.ParsePath(p); err == nil {
 		p = pp.String()
 	}
@@ -148,10 +148,10 @@ func ParsePath(p string) Path {
 	return &path{path: p}
 }
 
-// NewResolvedPath creates new ResolvedPath. This function performs no checks
+// NewResolvedPath creates new Resolved path. This function performs no checks
 // and is intended to be used by resolver implementations. Incorrect inputs may
 // cause panics. Handle with care.
-func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) ResolvedPath {
+func NewResolvedPath(ipath ipfspath.Path, c cid.Cid, root cid.Cid, remainder string) Resolved {
 	return &resolvedPath{
 		path:      path{ipath.String()},
 		cid:       c,
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 736b2d68b..7df2956f0 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -10,7 +10,7 @@ import (
 // Pin holds information about pinned resource
 type Pin interface {
 	// Path to the pinned object
-	Path() path.ResolvedPath
+	Path() path.Resolved
 
 	// Type of the pin
 	Type() string
@@ -28,7 +28,7 @@ type PinStatus interface {
 // BadPinNode is a node that has been marked as bad by Pin.Verify
 type BadPinNode interface {
 	// Path is the path of the node
-	Path() path.ResolvedPath
+	Path() path.Resolved
 
 	// Err is the reason why the node has been marked as bad
 	Err() error
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 59b49d567..961ac722d 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -111,7 +111,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 		t.Error("didn't get correct data back")
 	}
 
-	p := path.ParsePath("/ipfs/" + res.Path().Cid().String())
+	p := path.New("/ipfs/" + res.Path().Cid().String())
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 0abcee32f..fe92641f4 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -114,7 +114,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := path.ParsePath(gopath.Join(nd.Cid().String(), "lnk"))
+	p := path.New(gopath.Join(nd.Cid().String(), "lnk"))
 
 	rp, err := api.ResolvePath(ctx, p)
 	if err != nil {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 98ae6853e..efaf1d3ae 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -36,7 +36,7 @@ func addTestObject(ctx context.Context, api coreiface.CoreAPI) (path.Path, error
 }
 
 func appendPath(p path.Path, sub string) path.Path {
-	return path.ParsePath(gopath.Join(p.String(), sub))
+	return path.New(gopath.Join(p.String(), sub))
 }
 
 func (tp *provider) TestPublishResolve(t *testing.T) {
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 685f46998..4fd18bd20 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -75,7 +75,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp1, err := api.ResolvePath(ctx, path.ParsePath(nd.String()+"/foo/bar"))
+	rp1, err := api.ResolvePath(ctx, path.New(nd.String()+"/foo/bar"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -106,7 +106,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp1, err := api.ResolvePath(ctx, path.ParsePath(nd.Cid().String()))
+	rp1, err := api.ResolvePath(ctx, path.New(nd.Cid().String()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -137,7 +137,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = api.ResolvePath(ctx, path.ParsePath("/ipld/"+nd.Cid().String()+"/bar/baz"))
+	_, err = api.ResolvePath(ctx, path.New("/ipld/"+nd.Cid().String()+"/bar/baz"))
 	if err == nil || !strings.Contains(err.Error(), "no such link found") {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -173,7 +173,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	rp, err := api.ResolvePath(ctx, path.ParsePath("/ipld/"+nd.Cid().String()+"/foo"))
+	rp, err := api.ResolvePath(ctx, path.New("/ipld/"+nd.Cid().String()+"/foo"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -188,7 +188,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 }
 
 func (tp *provider) TestPathJoin(t *testing.T) {
-	p1 := path.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
+	p1 := path.New("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
 
 	if path.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
 		t.Error("unexpected path")
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index d2d9f85b8..38fab7cd8 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -102,7 +102,7 @@ func (tp *provider) TestAdd(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := func(h string) path.ResolvedPath {
+	p := func(h string) path.Resolved {
 		c, err := cid.Parse(h)
 		if err != nil {
 			t.Fatal(err)
@@ -593,7 +593,7 @@ func (tp *provider) TestGetEmptyFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	emptyFilePath := path.ParsePath(emptyFile)
+	emptyFilePath := path.New(emptyFile)
 
 	r, err := api.Unixfs().Get(ctx, emptyFilePath)
 	if err != nil {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 0b27519f3..686c40298 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -11,9 +11,9 @@ import (
 
 type AddEvent struct {
 	Name  string
-	Path  path.ResolvedPath `json:",omitempty"`
-	Bytes int64              `json:",omitempty"`
-	Size  string             `json:",omitempty"`
+	Path  path.Resolved `json:",omitempty"`
+	Bytes int64         `json:",omitempty"`
+	Size  string        `json:",omitempty"`
 }
 
 // FileType is an enum of possible UnixFS file types.
@@ -65,7 +65,7 @@ type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
 	//
 	// TODO: a long useful comment on how to use this for many different scenarios
-	Add(context.Context, files.Node, ...options.UnixfsAddOption) (path.ResolvedPath, error)
+	Add(context.Context, files.Node, ...options.UnixfsAddOption) (path.Resolved, error)
 
 	// Get returns a read-only handle to a file tree referenced by a path
 	//

From eb58ebe446c0d2d3aad742719c65e8f693f7ce68 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 15 Apr 2019 21:58:51 -0700
Subject: [PATCH 216/247] fix: cleanup TestDhtProvide

And fix for peer ID formatting changes.

fixes https://github.com/ipfs/go-ipfs/pull/6222#issuecomment-483479039


This commit was moved from ipfs/interface-go-ipfs-core@29b26f5bcb322e936e67dfbb7b0a5264b7e23089

This commit was moved from ipfs/boxo@d493b701942234de0168890c2625082ff382e1b3
---
 core/coreiface/tests/dht.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 1793cd738..5482b50b1 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -130,17 +130,17 @@ func (tp *provider) TestDhtProvide(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	provider := <-out
+	_, ok := <-out
+
+	if ok {
+		t.Fatal("did not expect to find any providers")
+	}
 
 	self0, err := apis[0].Key().Self(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if provider.ID.String() != "<peer.ID >" {
-		t.Errorf("got wrong provider: %s != %s", provider.ID.String(), self0.ID().String())
-	}
-
 	err = apis[0].Dht().Provide(ctx, p)
 	if err != nil {
 		t.Fatal(err)
@@ -151,7 +151,7 @@ func (tp *provider) TestDhtProvide(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	provider = <-out
+	provider := <-out
 
 	if provider.ID.String() != self0.ID().String() {
 		t.Errorf("got wrong provider: %s != %s", provider.ID.String(), self0.ID().String())

From ce49669839c31312bbcff89cda410c46a842a026 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 7 May 2019 00:57:21 -0700
Subject: [PATCH 217/247] switch to base32 cidv1 by default

This commit was moved from ipfs/interface-go-ipfs-core@6287246646853656271cbd190acab071950d4060

This commit was moved from ipfs/boxo@763b3d8a00d19fd1ba9d5b5b8825cbd7a7f01d1e
---
 core/coreiface/tests/block.go  |  4 ++--
 core/coreiface/tests/dag.go    |  6 +++---
 core/coreiface/tests/unixfs.go | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 961ac722d..34e47e90c 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -61,7 +61,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != "zdpuAn4amuLWo8Widi5v6VQpuo2dnpnwbVE3oB6qqs7mDSeoa" {
+	if res.Path().Cid().String() != "bafyreiayl6g3gitr7ys7kyng7sjywlrgimdoymco3jiyab6rozecmoazne" {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
@@ -79,7 +79,7 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != "zBurKB9YZkcDf6xa53WBE8CFX4ydVqAyf9KPXBFZt5stJzEstaS8Hukkhu4gwpMtc1xHNDbzP7sPtQKyWsP3C8fbhkmrZ" {
+	if res.Path().Cid().String() != "bafyb2qgdh7w6dcq24u65xbtdoehyavegnpvxcqce7ttvs6ielgmwdfxrahmu37d33atik57x5y6s7d7qz32aasuwgirh3ocn6ywswqdifvu6e" {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index fe92641f4..0bb3aa487 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -58,7 +58,7 @@ func (tp *provider) TestPut(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+	if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
 		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 }
@@ -81,7 +81,7 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if nd.Cid().String() != "z5hRLNd2sv4z1c" {
+	if nd.Cid().String() != "bafyqabtfjbswy3dp" {
 		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 }
@@ -179,7 +179,7 @@ func (tp *provider) TestBatch(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
+	if nd.Cid().String() != "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm" {
 		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 38fab7cd8..c810167e8 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -170,20 +170,20 @@ func (tp *provider) TestAdd(t *testing.T) {
 		{
 			name: "addCidV1",
 			data: strFile(helloStr),
-			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
 			opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1)},
 		},
 		{
 			name: "addCidV1NoLeaves",
 			data: strFile(helloStr),
-			path: "/ipfs/zdj7WY4GbN8NDbTW1dfCShAQNVovams2xhq9hVCx5vXcjvT8g",
+			path: "/ipfs/bafybeibhbcn7k7o2m6xsqkrlfiokod3nxwe47viteynhruh6uqx7hvkjfu",
 			opts: []options.UnixfsAddOption{options.Unixfs.CidVersion(1), options.Unixfs.RawLeaves(false)},
 		},
 		// Non sha256 hash vs CID
 		{
 			name: "addCidSha3",
 			data: strFile(helloStr),
-			path: "/ipfs/zb2wwnYtXBxpndNABjtYxWAPt3cwWNRnc11iT63fvkYV78iRb",
+			path: "/ipfs/bafkrmichjflejeh6aren53o7pig7zk3m3vxqcoc2i5dv326k3x6obh7jry",
 			opts: []options.UnixfsAddOption{options.Unixfs.Hash(mh.SHA3_256)},
 		},
 		{
@@ -196,25 +196,25 @@ func (tp *provider) TestAdd(t *testing.T) {
 		{
 			name: "addInline",
 			data: strFile(helloStr),
-			path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
+			path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
 			opts: []options.UnixfsAddOption{options.Unixfs.Inline(true)},
 		},
 		{
 			name: "addInlineLimit",
 			data: strFile(helloStr),
-			path: "/ipfs/zaYomJdLndMku8P9LHngHB5w2CQ7NenLbv",
+			path: "/ipfs/bafyaafikcmeaeeqnnbswy3dpfqqho33snrsccgan",
 			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true)},
 		},
 		{
 			name: "addInlineZero",
 			data: strFile(""),
-			path: "/ipfs/z2yYDV",
+			path: "/ipfs/bafkqaaa",
 			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(0), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
 		},
 		{ //TODO: after coreapi add is used in `ipfs add`, consider making this default for inline
 			name: "addInlineRaw",
 			data: strFile(helloStr),
-			path: "/ipfs/zj7Gr8AcBreqGEfrnR5kPFe",
+			path: "/ipfs/bafkqadlimvwgy3zmeb3w64tmmqqq",
 			opts: []options.UnixfsAddOption{options.Unixfs.InlineLimit(32), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true)},
 		},
 		// Chunker / Layout
@@ -291,20 +291,20 @@ func (tp *provider) TestAdd(t *testing.T) {
 		{
 			name: "simpleNoCopy",
 			data: realFile,
-			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
 			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
 		},
 		{
 			name: "noCopyNoRaw",
 			data: realFile,
-			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
 			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true), options.Unixfs.RawLeaves(false)},
 			err:  "nocopy option requires '--raw-leaves' to be enabled as well",
 		},
 		{
 			name: "noCopyNoPath",
 			data: strFile(helloStr),
-			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
 			opts: []options.UnixfsAddOption{options.Unixfs.Nocopy(true)},
 			err:  helpers.ErrMissingFsRef.Error(),
 		},
@@ -312,9 +312,9 @@ func (tp *provider) TestAdd(t *testing.T) {
 		{
 			name: "simpleAddEvent",
 			data: strFile(helloStr),
-			path: "/ipfs/zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd",
+			path: "/ipfs/bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa",
 			events: []coreiface.AddEvent{
-				{Name: "zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd", Path: p("zb2rhdhmJjJZs9qkhQCpCQ7VREFkqWw3h1r8utjVvQugwHPFd"), Size: strconv.Itoa(len(helloStr))},
+				{Name: "bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa", Path: p("bafkreidi4zlleupgp2bvrpxyja5lbvi4mym7hz5bvhyoowby2qp7g2hxfa"), Size: strconv.Itoa(len(helloStr))},
 			},
 			opts: []options.UnixfsAddOption{options.Unixfs.RawLeaves(true)},
 		},

From 79958dc097b5b6399e4b4e0af859e711d0f6726e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 17 May 2019 18:57:15 +0200
Subject: [PATCH 218/247] tests: expose TestSuite

This commit was moved from ipfs/interface-go-ipfs-core@6fe8577a835a24bf8a38de0d5ee9d1fe6ca9e913

This commit was moved from ipfs/boxo@3d72707f576f881c01bc5fc9ffb97ece3456c014
---
 core/coreiface/tests/api.go    | 22 ++++++++++++----------
 core/coreiface/tests/block.go  | 16 ++++++++--------
 core/coreiface/tests/dag.go    | 12 ++++++------
 core/coreiface/tests/dht.go    |  8 ++++----
 core/coreiface/tests/key.go    | 34 +++++++++++++++++-----------------
 core/coreiface/tests/name.go   |  8 ++++----
 core/coreiface/tests/object.go | 26 +++++++++++++-------------
 core/coreiface/tests/path.go   | 14 +++++++-------
 core/coreiface/tests/pin.go    |  8 ++++----
 core/coreiface/tests/pubsub.go |  4 ++--
 core/coreiface/tests/unixfs.go | 26 +++++++++++++-------------
 11 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 5e7c1f541..1af3a83b3 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -11,7 +11,7 @@ import (
 
 var apiNotImplemented = errors.New("api not implemented")
 
-func (tp *provider) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
+func (tp *TestSuite) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
 	api, err := tp.MakeAPISwarm(ctx, false, 1)
 	if err != nil {
 		return nil, err
@@ -25,17 +25,19 @@ type Provider interface {
 	MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error)
 }
 
-func (tp *provider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
-	tp.apis <- 1
-	go func() {
-		<-ctx.Done()
-		tp.apis <- -1
-	}()
+func (tp *TestSuite) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
+	if tp.apis != nil {
+		tp.apis <- 1
+		go func() {
+			<-ctx.Done()
+			tp.apis <- -1
+		}()
+	}
 
 	return tp.Provider.MakeAPISwarm(ctx, fullIdentity, n)
 }
 
-type provider struct {
+type TestSuite struct {
 	Provider
 
 	apis chan int
@@ -55,7 +57,7 @@ func TestApi(p Provider) func(t *testing.T) {
 		}
 	}()
 
-	tp := &provider{Provider: p, apis: apis}
+	tp := &TestSuite{Provider: p, apis: apis}
 
 	return func(t *testing.T) {
 		t.Run("Block", tp.TestBlock)
@@ -80,7 +82,7 @@ func TestApi(p Provider) func(t *testing.T) {
 	}
 }
 
-func (tp *provider) hasApi(t *testing.T, tf func(coreiface.CoreAPI) error) {
+func (tp *TestSuite) hasApi(t *testing.T, tf func(coreiface.CoreAPI) error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 34e47e90c..6b648f394 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -13,7 +13,7 @@ import (
 	mh "github.com/multiformats/go-multihash"
 )
 
-func (tp *provider) TestBlock(t *testing.T) {
+func (tp *TestSuite) TestBlock(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Block() == nil {
 			return apiNotImplemented
@@ -30,7 +30,7 @@ func (tp *provider) TestBlock(t *testing.T) {
 	t.Run("TestBlockPin", tp.TestBlockPin)
 }
 
-func (tp *provider) TestBlockPut(t *testing.T) {
+func (tp *TestSuite) TestBlockPut(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -48,7 +48,7 @@ func (tp *provider) TestBlockPut(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockPutFormat(t *testing.T) {
+func (tp *TestSuite) TestBlockPutFormat(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -66,7 +66,7 @@ func (tp *provider) TestBlockPutFormat(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockPutHash(t *testing.T) {
+func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -84,7 +84,7 @@ func (tp *provider) TestBlockPutHash(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockGet(t *testing.T) {
+func (tp *TestSuite) TestBlockGet(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -122,7 +122,7 @@ func (tp *provider) TestBlockGet(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockRm(t *testing.T) {
+func (tp *TestSuite) TestBlockRm(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -176,7 +176,7 @@ func (tp *provider) TestBlockRm(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockStat(t *testing.T) {
+func (tp *TestSuite) TestBlockStat(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -203,7 +203,7 @@ func (tp *provider) TestBlockStat(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBlockPin(t *testing.T) {
+func (tp *TestSuite) TestBlockPin(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 0bb3aa487..1ccd45d59 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -15,7 +15,7 @@ import (
 	mh "github.com/multiformats/go-multihash"
 )
 
-func (tp *provider) TestDag(t *testing.T) {
+func (tp *TestSuite) TestDag(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Dag() == nil {
 			return apiNotImplemented
@@ -40,7 +40,7 @@ var (
 	}
 )
 
-func (tp *provider) TestPut(t *testing.T) {
+func (tp *TestSuite) TestPut(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -63,7 +63,7 @@ func (tp *provider) TestPut(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPutWithHash(t *testing.T) {
+func (tp *TestSuite) TestPutWithHash(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -86,7 +86,7 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestDagPath(t *testing.T) {
+func (tp *TestSuite) TestDagPath(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -131,7 +131,7 @@ func (tp *provider) TestDagPath(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestTree(t *testing.T) {
+func (tp *TestSuite) TestTree(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -166,7 +166,7 @@ func (tp *provider) TestTree(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBatch(t *testing.T) {
+func (tp *TestSuite) TestBatch(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 5482b50b1..33b4ff14c 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
-func (tp *provider) TestDht(t *testing.T) {
+func (tp *TestSuite) TestDht(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Dht() == nil {
 			return apiNotImplemented
@@ -22,7 +22,7 @@ func (tp *provider) TestDht(t *testing.T) {
 	t.Run("TestDhtProvide", tp.TestDhtProvide)
 }
 
-func (tp *provider) TestDhtFindPeer(t *testing.T) {
+func (tp *TestSuite) TestDhtFindPeer(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
@@ -75,7 +75,7 @@ func (tp *provider) TestDhtFindPeer(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestDhtFindProviders(t *testing.T) {
+func (tp *TestSuite) TestDhtFindProviders(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
@@ -105,7 +105,7 @@ func (tp *provider) TestDhtFindProviders(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestDhtProvide(t *testing.T) {
+func (tp *TestSuite) TestDhtProvide(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 7ff5f3330..e3461f971 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -9,7 +9,7 @@ import (
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
-func (tp *provider) TestKey(t *testing.T) {
+func (tp *TestSuite) TestKey(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Key() == nil {
 			return apiNotImplemented
@@ -35,7 +35,7 @@ func (tp *provider) TestKey(t *testing.T) {
 	t.Run("TestRemove", tp.TestRemove)
 }
 
-func (tp *provider) TestListSelf(t *testing.T) {
+func (tp *TestSuite) TestListSelf(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -69,7 +69,7 @@ func (tp *provider) TestListSelf(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameSelf(t *testing.T) {
+func (tp *TestSuite) TestRenameSelf(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -97,7 +97,7 @@ func (tp *provider) TestRenameSelf(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRemoveSelf(t *testing.T) {
+func (tp *TestSuite) TestRemoveSelf(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -116,7 +116,7 @@ func (tp *provider) TestRemoveSelf(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGenerate(t *testing.T) {
+func (tp *TestSuite) TestGenerate(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -139,7 +139,7 @@ func (tp *provider) TestGenerate(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGenerateSize(t *testing.T) {
+func (tp *TestSuite) TestGenerateSize(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -162,7 +162,7 @@ func (tp *provider) TestGenerateSize(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGenerateType(t *testing.T) {
+func (tp *TestSuite) TestGenerateType(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	t.Skip("disabled until libp2p/specs#111 is fixed")
@@ -188,7 +188,7 @@ func (tp *provider) TestGenerateType(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGenerateExisting(t *testing.T) {
+func (tp *TestSuite) TestGenerateExisting(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -221,7 +221,7 @@ func (tp *provider) TestGenerateExisting(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestList(t *testing.T) {
+func (tp *TestSuite) TestList(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -267,7 +267,7 @@ func (tp *provider) TestList(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRename(t *testing.T) {
+func (tp *TestSuite) TestRename(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -296,7 +296,7 @@ func (tp *provider) TestRename(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameToSelf(t *testing.T) {
+func (tp *TestSuite) TestRenameToSelf(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -320,7 +320,7 @@ func (tp *provider) TestRenameToSelf(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameToSelfForce(t *testing.T) {
+func (tp *TestSuite) TestRenameToSelfForce(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -344,7 +344,7 @@ func (tp *provider) TestRenameToSelfForce(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
+func (tp *TestSuite) TestRenameOverwriteNoForce(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -374,7 +374,7 @@ func (tp *provider) TestRenameOverwriteNoForce(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameOverwrite(t *testing.T) {
+func (tp *TestSuite) TestRenameOverwrite(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -413,7 +413,7 @@ func (tp *provider) TestRenameOverwrite(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
+func (tp *TestSuite) TestRenameSameNameNoForce(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -442,7 +442,7 @@ func (tp *provider) TestRenameSameNameNoForce(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRenameSameName(t *testing.T) {
+func (tp *TestSuite) TestRenameSameName(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -471,7 +471,7 @@ func (tp *provider) TestRenameSameName(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestRemove(t *testing.T) {
+func (tp *TestSuite) TestRemove(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index efaf1d3ae..31a5c1466 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -16,7 +16,7 @@ import (
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
-func (tp *provider) TestName(t *testing.T) {
+func (tp *TestSuite) TestName(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Name() == nil {
 			return apiNotImplemented
@@ -39,7 +39,7 @@ func appendPath(p path.Path, sub string) path.Path {
 	return path.New(gopath.Join(p.String(), sub))
 }
 
-func (tp *provider) TestPublishResolve(t *testing.T) {
+func (tp *TestSuite) TestPublishResolve(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	init := func() (coreiface.CoreAPI, path.Path) {
@@ -188,7 +188,7 @@ func (tp *provider) TestPublishResolve(t *testing.T) {
 	})
 }
 
-func (tp *provider) TestBasicPublishResolveKey(t *testing.T) {
+func (tp *TestSuite) TestBasicPublishResolveKey(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	apis, err := tp.MakeAPISwarm(ctx, true, 5)
@@ -230,7 +230,7 @@ func (tp *provider) TestBasicPublishResolveKey(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestBasicPublishResolveTimeout(t *testing.T) {
+func (tp *TestSuite) TestBasicPublishResolveTimeout(t *testing.T) {
 	t.Skip("ValidTime doesn't appear to work at this time resolution")
 
 	ctx, cancel := context.WithCancel(context.Background())
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 8682a2edc..2e066ca71 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -12,7 +12,7 @@ import (
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
-func (tp *provider) TestObject(t *testing.T) {
+func (tp *TestSuite) TestObject(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Object() == nil {
 			return apiNotImplemented
@@ -34,7 +34,7 @@ func (tp *provider) TestObject(t *testing.T) {
 	t.Run("TestDiffTest", tp.TestDiffTest)
 }
 
-func (tp *provider) TestNew(t *testing.T) {
+func (tp *TestSuite) TestNew(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -61,7 +61,7 @@ func (tp *provider) TestNew(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectPut(t *testing.T) {
+func (tp *TestSuite) TestObjectPut(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -102,7 +102,7 @@ func (tp *provider) TestObjectPut(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectGet(t *testing.T) {
+func (tp *TestSuite) TestObjectGet(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -125,7 +125,7 @@ func (tp *provider) TestObjectGet(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectData(t *testing.T) {
+func (tp *TestSuite) TestObjectData(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -153,7 +153,7 @@ func (tp *provider) TestObjectData(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectLinks(t *testing.T) {
+func (tp *TestSuite) TestObjectLinks(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -189,7 +189,7 @@ func (tp *provider) TestObjectLinks(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectStat(t *testing.T) {
+func (tp *TestSuite) TestObjectStat(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -237,7 +237,7 @@ func (tp *provider) TestObjectStat(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectAddLink(t *testing.T) {
+func (tp *TestSuite) TestObjectAddLink(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -278,7 +278,7 @@ func (tp *provider) TestObjectAddLink(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
+func (tp *TestSuite) TestObjectAddLinkCreate(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -327,7 +327,7 @@ func (tp *provider) TestObjectAddLinkCreate(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectRmLink(t *testing.T) {
+func (tp *TestSuite) TestObjectRmLink(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -360,7 +360,7 @@ func (tp *provider) TestObjectRmLink(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectAddData(t *testing.T) {
+func (tp *TestSuite) TestObjectAddData(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -393,7 +393,7 @@ func (tp *provider) TestObjectAddData(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestObjectSetData(t *testing.T) {
+func (tp *TestSuite) TestObjectSetData(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -426,7 +426,7 @@ func (tp *provider) TestObjectSetData(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestDiffTest(t *testing.T) {
+func (tp *TestSuite) TestDiffTest(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 4fd18bd20..2d9497244 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -12,7 +12,7 @@ import (
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
 )
 
-func (tp *provider) TestPath(t *testing.T) {
+func (tp *TestSuite) TestPath(t *testing.T) {
 	t.Run("TestMutablePath", tp.TestMutablePath)
 	t.Run("TestPathRemainder", tp.TestPathRemainder)
 	t.Run("TestEmptyPathRemainder", tp.TestEmptyPathRemainder)
@@ -21,7 +21,7 @@ func (tp *provider) TestPath(t *testing.T) {
 	t.Run("TestPathJoin", tp.TestPathJoin)
 }
 
-func (tp *provider) TestMutablePath(t *testing.T) {
+func (tp *TestSuite) TestMutablePath(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -54,7 +54,7 @@ func (tp *provider) TestMutablePath(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPathRemainder(t *testing.T) {
+func (tp *TestSuite) TestPathRemainder(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -85,7 +85,7 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
+func (tp *TestSuite) TestEmptyPathRemainder(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -116,7 +116,7 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
+func (tp *TestSuite) TestInvalidPathRemainder(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -143,7 +143,7 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPathRoot(t *testing.T) {
+func (tp *TestSuite) TestPathRoot(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -187,7 +187,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPathJoin(t *testing.T) {
+func (tp *TestSuite) TestPathJoin(t *testing.T) {
 	p1 := path.New("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
 
 	if path.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 344db65e2..9b28a682a 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -14,7 +14,7 @@ import (
 	ipld "github.com/ipfs/go-ipld-format"
 )
 
-func (tp *provider) TestPin(t *testing.T) {
+func (tp *TestSuite) TestPin(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Pin() == nil {
 			return apiNotImplemented
@@ -27,7 +27,7 @@ func (tp *provider) TestPin(t *testing.T) {
 	t.Run("TestPinRecursive", tp.TestPinRecursive)
 }
 
-func (tp *provider) TestPinAdd(t *testing.T) {
+func (tp *TestSuite) TestPinAdd(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -46,7 +46,7 @@ func (tp *provider) TestPinAdd(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPinSimple(t *testing.T) {
+func (tp *TestSuite) TestPinSimple(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -96,7 +96,7 @@ func (tp *provider) TestPinSimple(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestPinRecursive(t *testing.T) {
+func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index 418fc4867..e66291572 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
-func (tp *provider) TestPubSub(t *testing.T) {
+func (tp *TestSuite) TestPubSub(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.PubSub() == nil {
 			return apiNotImplemented
@@ -20,7 +20,7 @@ func (tp *provider) TestPubSub(t *testing.T) {
 	t.Run("TestBasicPubSub", tp.TestBasicPubSub)
 }
 
-func (tp *provider) TestBasicPubSub(t *testing.T) {
+func (tp *TestSuite) TestBasicPubSub(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index c810167e8..47ce505c8 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -28,7 +28,7 @@ import (
 	mh "github.com/multiformats/go-multihash"
 )
 
-func (tp *provider) TestUnixfs(t *testing.T) {
+func (tp *TestSuite) TestUnixfs(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Unixfs() == nil {
 			return apiNotImplemented
@@ -94,7 +94,7 @@ func wrapped(names ...string) func(f files.Node) files.Node {
 	}
 }
 
-func (tp *provider) TestAdd(t *testing.T) {
+func (tp *TestSuite) TestAdd(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -528,7 +528,7 @@ func (tp *provider) TestAdd(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestAddPinned(t *testing.T) {
+func (tp *TestSuite) TestAddPinned(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -554,7 +554,7 @@ func (tp *provider) TestAddPinned(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestAddHashOnly(t *testing.T) {
+func (tp *TestSuite) TestAddHashOnly(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -580,7 +580,7 @@ func (tp *provider) TestAddHashOnly(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGetEmptyFile(t *testing.T) {
+func (tp *TestSuite) TestGetEmptyFile(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -610,7 +610,7 @@ func (tp *provider) TestGetEmptyFile(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGetDir(t *testing.T) {
+func (tp *TestSuite) TestGetDir(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -643,7 +643,7 @@ func (tp *provider) TestGetDir(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGetNonUnixfs(t *testing.T) {
+func (tp *TestSuite) TestGetNonUnixfs(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -663,7 +663,7 @@ func (tp *provider) TestGetNonUnixfs(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestLs(t *testing.T) {
+func (tp *TestSuite) TestLs(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -723,7 +723,7 @@ func (tp *provider) TestLs(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestEntriesExpired(t *testing.T) {
+func (tp *TestSuite) TestEntriesExpired(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -765,7 +765,7 @@ func (tp *provider) TestEntriesExpired(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestLsEmptyDir(t *testing.T) {
+func (tp *TestSuite) TestLsEmptyDir(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -794,7 +794,7 @@ func (tp *provider) TestLsEmptyDir(t *testing.T) {
 }
 
 // TODO(lgierth) this should test properly, with len(links) > 0
-func (tp *provider) TestLsNonUnixfs(t *testing.T) {
+func (tp *TestSuite) TestLsNonUnixfs(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -853,7 +853,7 @@ func (f *closeTestF) Close() error {
 	return nil
 }
 
-func (tp *provider) TestAddCloses(t *testing.T) {
+func (tp *TestSuite) TestAddCloses(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -891,7 +891,7 @@ func (tp *provider) TestAddCloses(t *testing.T) {
 	}
 }
 
-func (tp *provider) TestGetSeek(t *testing.T) {
+func (tp *TestSuite) TestGetSeek(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)

From 1f4d8c7243039855f5c62f043168815d057777f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= <raul@protocol.ai>
Date: Tue, 28 May 2019 17:09:34 +0100
Subject: [PATCH 219/247] migrate to go-libp2p-core.

This commit was moved from ipfs/interface-go-ipfs-core@2cc0c497f2b0b14a4ac22989a3861c1a2b0038c4

This commit was moved from ipfs/boxo@1f2b5ca04f4cb9d5fe9b11d4c58edb91bab8b2a1
---
 core/coreiface/dht.go    |  7 +++----
 core/coreiface/key.go    |  2 +-
 core/coreiface/pubsub.go |  2 +-
 core/coreiface/swarm.go  | 12 ++++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 0cb7893ef..5f49e74a3 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -6,8 +6,7 @@ import (
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 // DhtAPI specifies the interface to the DHT
@@ -16,11 +15,11 @@ import (
 type DhtAPI interface {
 	// FindPeer queries the DHT for all of the multiaddresses associated with a
 	// Peer ID
-	FindPeer(context.Context, peer.ID) (pstore.PeerInfo, error)
+	FindPeer(context.Context, peer.ID) (peer.AddrInfo, error)
 
 	// FindProviders finds peers in the DHT who can provide a specific value
 	// given a key.
-	FindProviders(context.Context, path.Path, ...options.DhtFindProvidersOption) (<-chan pstore.PeerInfo, error)
+	FindProviders(context.Context, path.Path, ...options.DhtFindProvidersOption) (<-chan peer.AddrInfo, error)
 
 	// Provide announces to the network that you are providing given values
 	Provide(context.Context, path.Path, ...options.DhtProvideOption) error
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index e7fb3f442..db729b3b4 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 212e77225..d9826551d 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 
-	peer "github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 2e00ecbd3..d7b25d5e8 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,10 +5,10 @@ import (
 	"errors"
 	"time"
 
-	net "github.com/libp2p/go-libp2p-net"
-	"github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
-	"github.com/libp2p/go-libp2p-protocol"
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/protocol"
+
 	ma "github.com/multiformats/go-multiaddr"
 )
 
@@ -26,7 +26,7 @@ type ConnectionInfo interface {
 	Address() ma.Multiaddr
 
 	// Direction returns which way the connection was established
-	Direction() net.Direction
+	Direction() network.Direction
 
 	// Latency returns last known round trip time to the peer
 	Latency() (time.Duration, error)
@@ -38,7 +38,7 @@ type ConnectionInfo interface {
 // SwarmAPI specifies the interface to libp2p swarm
 type SwarmAPI interface {
 	// Connect to a given peer
-	Connect(context.Context, pstore.PeerInfo) error
+	Connect(context.Context, peer.AddrInfo) error
 
 	// Disconnect from a given address
 	Disconnect(context.Context, ma.Multiaddr) error

From fafbedb658bbc4e4f317c8c8395794f3617647ba Mon Sep 17 00:00:00 2001
From: Cole Brown <bigswim@gmail.com>
Date: Fri, 2 Aug 2019 21:09:17 -0400
Subject: [PATCH 220/247] Bump go-libp2p-core, up test key size to 2048

This commit was moved from ipfs/interface-go-ipfs-core@6ba366dd626d3b605a67d7ade24b3065bc4d9694

This commit was moved from ipfs/boxo@98cec339880e00290049245fc50acf6fc2874701
---
 core/coreiface/tests/key.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index e3461f971..265a8f060 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -147,7 +147,7 @@ func (tp *TestSuite) TestGenerateSize(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	k, err := api.Key().Generate(ctx, "foo", opt.Key.Size(1024))
+	k, err := api.Key().Generate(ctx, "foo", opt.Key.Size(2048))
 	if err != nil {
 		t.Fatal(err)
 		return

From 09a4311db7804b6d511ce99e65029bdb283b2c4d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 23 Aug 2019 16:22:22 -0700
Subject: [PATCH 221/247] test: fix put with hash test

We just changed ID/"id" to IDENTITY/"identity" to match the multicodec table and
avoid confusion with peer IDs, CIDs, etc.

Unfortunately, this breaks the `--hash=id` flag. Luckily, I'm pretty sure
nobody's actually using this. As putting a block with an identity hash is
useless. If they are users, we can go about adding in backwards compatibility
hacks later.


This commit was moved from ipfs/interface-go-ipfs-core@6ebdbe7ef3eadc7f832592abb3b1b151d9b4febf

This commit was moved from ipfs/boxo@3b9a723861fa7b8069ac6a0c698f83a8b6e82237
---
 core/coreiface/tests/dag.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 1ccd45d59..2f68bbf05 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -71,7 +71,7 @@ func (tp *TestSuite) TestPutWithHash(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), mh.ID, -1)
+	nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), mh.SHA3_256, -1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -81,7 +81,7 @@ func (tp *TestSuite) TestPutWithHash(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if nd.Cid().String() != "bafyqabtfjbswy3dp" {
+	if nd.Cid().String() != "bafyrmifu7haikttpqqgc5ewvmp76z3z4ebp7h2ph4memw7dq4nt6btmxny" {
 		t.Errorf("got wrong cid: %s", nd.Cid().String())
 	}
 }

From 5168b591dc343f345b0074bcbee870888a7e001d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 10 Sep 2019 18:23:14 -0700
Subject: [PATCH 222/247] test: test ReadAt if implemented

(I plan on adding support to the http client, at least)


This commit was moved from ipfs/interface-go-ipfs-core@ae838686170af209e0a9b29aa1a59b64346b5de1

This commit was moved from ipfs/boxo@a8c5ec606246224d3f0dfadfc627a9f90d9b53df
---
 core/coreiface/tests/unixfs.go | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 47ce505c8..aac7fa92f 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -48,6 +48,7 @@ func (tp *TestSuite) TestUnixfs(t *testing.T) {
 	t.Run("TestLsNonUnixfs", tp.TestLsNonUnixfs)
 	t.Run("TestAddCloses", tp.TestAddCloses)
 	t.Run("TestGetSeek", tp.TestGetSeek)
+	t.Run("TestGetReadAt", tp.TestGetReadAt)
 }
 
 // `echo -n 'hello, world!' | ipfs add`
@@ -996,3 +997,84 @@ func (tp *TestSuite) TestGetSeek(t *testing.T) {
 	test(dataSize-50, io.SeekStart, 100, 50, true)
 	test(-5, io.SeekEnd, 100, 5, true)
 }
+
+func (tp *TestSuite) TestGetReadAt(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dataSize := int64(100000)
+	tf := files.NewReaderFile(io.LimitReader(rand.New(rand.NewSource(1403768328)), dataSize))
+
+	p, err := api.Unixfs().Add(ctx, tf, options.Unixfs.Chunker("size-100"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := api.Unixfs().Get(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	f, ok := r.(interface {
+		files.File
+		io.ReaderAt
+	})
+	if !ok {
+		t.Skip("ReaderAt not implemented")
+	}
+
+	orig := make([]byte, dataSize)
+	if _, err := io.ReadFull(f, orig); err != nil {
+		t.Fatal(err)
+	}
+	f.Close()
+
+	origR := bytes.NewReader(orig)
+
+	r, err = api.Unixfs().Get(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	test := func(offset int64, read int, expect int64, shouldEof bool) {
+		t.Run(fmt.Sprintf("readat%d-r%d-%d", offset, read, expect), func(t *testing.T) {
+			origBuf := make([]byte, read)
+			origRead, err := origR.ReadAt(origBuf, offset)
+			if err != nil && err != io.EOF {
+				t.Fatalf("orig: %s", err)
+			}
+			buf := make([]byte, read)
+			r, err := f.ReadAt(buf, offset)
+			if shouldEof {
+				if err != io.EOF {
+					t.Fatal("expected EOF, got: ", err)
+				}
+			} else if err != nil {
+				t.Fatal("got: ", err)
+			}
+
+			if int64(r) != expect {
+				t.Fatal("read wrong amount of data")
+			}
+			if r != origRead {
+				t.Fatal("read different amount of data than bytes.Reader")
+			}
+			if !bytes.Equal(buf, origBuf) {
+				fmt.Fprintf(os.Stderr, "original:\n%s\n", hex.Dump(origBuf))
+				fmt.Fprintf(os.Stderr, "got:\n%s\n", hex.Dump(buf))
+				t.Fatal("data didn't match")
+			}
+		})
+	}
+
+	test(3, 10, 10, false)
+	test(13, 10, 10, false)
+	test(513, 10, 10, false)
+	test(350, 100, 100, false)
+	test(0, int(dataSize), dataSize, false)
+	test(dataSize-50, 100, 50, true)
+}

From 58df273d66f263915aad240a414df15ac538a0e2 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 27 Sep 2019 16:21:44 -0700
Subject: [PATCH 223/247] fix(test): fix a flaky pubsub test

This commit was moved from ipfs/interface-go-ipfs-core@00de46e290cf0a47bb78a9e8aa264f4b6ce941cd

This commit was moved from ipfs/boxo@125f06e6af82e7502de7596d9cfb5a3b560df4e5
---
 core/coreiface/tests/pubsub.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index e66291572..36353f836 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -34,13 +34,20 @@ func (tp *TestSuite) TestBasicPubSub(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	done := make(chan struct{})
 	go func() {
+		defer close(done)
+
 		ticker := time.NewTicker(100 * time.Millisecond)
 		defer ticker.Stop()
 
 		for {
 			err := apis[1].PubSub().Publish(ctx, "testch", []byte("hello world"))
-			if err != nil {
+			switch err {
+			case nil:
+			case context.Canceled:
+				return
+			default:
 				t.Error(err)
 				cancel()
 				return
@@ -53,6 +60,13 @@ func (tp *TestSuite) TestBasicPubSub(t *testing.T) {
 		}
 	}()
 
+	// Wait for the sender to finish before we return.
+	// Otherwise, we can get random errors as publish fails.
+	defer func() {
+		cancel()
+		<-done
+	}()
+
 	m, err := sub.Next(ctx)
 	if err != nil {
 		t.Fatal(err)

From c23fa6e2f1f8732794fcb227ce109a5d04f5ed0f Mon Sep 17 00:00:00 2001
From: Adin Schmahmann <adin.schmahmann@gmail.com>
Date: Fri, 11 Oct 2019 11:14:39 -0400
Subject: [PATCH 224/247] test(pinning): add pin ls tests for indirect pin
 traversal and pin type precedence

This commit was moved from ipfs/interface-go-ipfs-core@cd7be61c71d8169a47604247588b258699f45b5d

This commit was moved from ipfs/boxo@30eb9c7c432be938b40951a4c98b8cfbe67899cc
---
 core/coreiface/tests/pin.go | 269 +++++++++++++++++++++++++++++++++++-
 1 file changed, 268 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 9b28a682a..7e574fa0d 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -2,14 +2,15 @@ package tests
 
 import (
 	"context"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	"strings"
 	"testing"
 
 	"github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 
+	"github.com/ipfs/go-cid"
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
 )
@@ -25,6 +26,8 @@ func (tp *TestSuite) TestPin(t *testing.T) {
 	t.Run("TestPinAdd", tp.TestPinAdd)
 	t.Run("TestPinSimple", tp.TestPinSimple)
 	t.Run("TestPinRecursive", tp.TestPinRecursive)
+	t.Run("TestPinLsIndirect", tp.TestPinLsIndirect)
+	t.Run("TestPinLsPrecedence", tp.TestPinLsPrecedence)
 }
 
 func (tp *TestSuite) TestPinAdd(t *testing.T) {
@@ -238,3 +241,267 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		}
 	*/
 }
+
+// TestPinLsIndirect verifies that indirect nodes are listed by pin ls even if a parent node is directly pinned
+func (tp *TestSuite) TestPinLsIndirect(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	leaf, parent, grandparent := getThreeChainedNodes(t, ctx, api, "foo")
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()), opt.Pin.Recursive(false))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinTypes(t, ctx, api, []cidContainer{grandparent}, []cidContainer{parent}, []cidContainer{leaf})
+}
+
+// TestPinLsPrecedence verifies the precedence of pins (recursive > direct > indirect)
+func (tp *TestSuite) TestPinLsPrecedence(t *testing.T) {
+	// Testing precedence of recursive, direct and indirect pins
+	// Results should be recursive > indirect, direct > indirect, and recursive > direct
+
+	t.Run("TestPinLsPredenceRecursiveIndirect", tp.TestPinLsPredenceRecursiveIndirect)
+	t.Run("TestPinLsPrecedenceDirectIndirect", tp.TestPinLsPrecedenceDirectIndirect)
+	t.Run("TestPinLsPrecedenceRecursiveDirect", tp.TestPinLsPrecedenceRecursiveDirect)
+}
+
+func (tp *TestSuite) TestPinLsPredenceRecursiveIndirect(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Test recursive > indirect
+	leaf, parent, grandparent := getThreeChainedNodes(t, ctx, api, "recursive > indirect")
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinTypes(t, ctx, api, []cidContainer{grandparent, parent}, []cidContainer{}, []cidContainer{leaf})
+}
+
+func (tp *TestSuite) TestPinLsPrecedenceDirectIndirect(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Test direct > indirect
+	leaf, parent, grandparent := getThreeChainedNodes(t, ctx, api, "direct > indirect")
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()), opt.Pin.Recursive(false))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinTypes(t, ctx, api, []cidContainer{grandparent}, []cidContainer{parent}, []cidContainer{leaf})
+}
+
+func (tp *TestSuite) TestPinLsPrecedenceRecursiveDirect(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Test recursive > direct
+	leaf, parent, grandparent := getThreeChainedNodes(t, ctx, api, "recursive + direct = error")
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()), opt.Pin.Recursive(false))
+	if err == nil {
+		t.Fatal("expected error directly pinning a recursively pinned node")
+	}
+
+	assertPinTypes(t, ctx, api, []cidContainer{parent}, []cidContainer{}, []cidContainer{leaf})
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()), opt.Pin.Recursive(false))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinTypes(t, ctx, api, []cidContainer{grandparent, parent}, []cidContainer{}, []cidContainer{leaf})
+}
+
+type cidContainer interface {
+	Cid() cid.Cid
+}
+
+func getThreeChainedNodes(t *testing.T, ctx context.Context, api iface.CoreAPI, leafData string) (cidContainer, cidContainer, cidContainer) {
+	leaf, err := api.Unixfs().Add(ctx, strFile(leafData)())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	parent, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+leaf.Cid().String()+`"}}`), math.MaxUint64, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	grandparent, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+parent.Cid().String()+`"}}`), math.MaxUint64, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := api.Dag().AddMany(ctx, []ipld.Node{parent, grandparent}); err != nil {
+		t.Fatal(err)
+	}
+
+	return leaf, parent, grandparent
+}
+
+func assertPinTypes(t *testing.T, ctx context.Context, api iface.CoreAPI, recusive, direct, indirect []cidContainer) {
+	assertPinLsAllConsistency(t, ctx, api)
+
+	list, err := api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinCids(t, list, recusive...)
+
+	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Direct())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinCids(t, list, direct...)
+
+	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertPinCids(t, list, indirect...)
+}
+
+// assertPinCids verifies that the pins match the expected cids
+func assertPinCids(t *testing.T, pins []iface.Pin, cids ...cidContainer) {
+	t.Helper()
+
+	if expected, actual := len(cids), len(pins); expected != actual {
+		t.Fatalf("expected pin list to have len %d, was %d", expected, actual)
+	}
+
+	cSet := cid.NewSet()
+	for _, c := range cids {
+		cSet.Add(c.Cid())
+	}
+
+	valid := true
+	for _, p := range pins {
+		c := p.Path().Cid()
+		if cSet.Has(c) {
+			cSet.Remove(c)
+		} else {
+			valid = false
+			break
+		}
+	}
+
+	valid = valid && cSet.Len() == 0
+
+	if !valid {
+		pinStrs := make([]string, len(pins))
+		for i, p := range pins {
+			pinStrs[i] = p.Path().Cid().String()
+		}
+		pathStrs := make([]string, len(cids))
+		for i, c := range cids {
+			pathStrs[i] = c.Cid().String()
+		}
+		t.Fatalf("expected: %s \nactual: %s", strings.Join(pathStrs, ", "), strings.Join(pinStrs, ", "))
+	}
+}
+
+// assertPinLsAllConsistency verifies that listing all pins gives the same result as listing the pin types individually
+func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.CoreAPI) {
+	t.Helper()
+	allPins, err := api.Pin().Ls(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	type pinTypeProps struct {
+		*cid.Set
+		opt.PinLsOption
+	}
+
+	all, recursive, direct, indirect := cid.NewSet(), cid.NewSet(), cid.NewSet(), cid.NewSet()
+	typeMap := map[string]*pinTypeProps{
+		"recursive": {recursive, opt.Pin.Type.Recursive()},
+		"direct":    {direct, opt.Pin.Type.Direct()},
+		"indirect":  {indirect, opt.Pin.Type.Indirect()},
+	}
+
+	for _, p := range allPins {
+		if !all.Visit(p.Path().Cid()) {
+			t.Fatalf("pin ls returned the same cid multiple times")
+		}
+
+		typeStr := p.Type()
+		if typeSet, ok := typeMap[p.Type()]; ok {
+			typeSet.Add(p.Path().Cid())
+		} else {
+			t.Fatalf("unknown pin type: %s", typeStr)
+		}
+	}
+
+	for typeStr, pinProps := range typeMap {
+		pins, err := api.Pin().Ls(ctx, pinProps.PinLsOption)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if expected, actual := len(pins), pinProps.Set.Len(); expected != actual {
+			t.Fatalf("pin ls all has %d pins of type %s, but pin ls for the type has %d", expected, typeStr, actual)
+		}
+
+		for _, p := range pins {
+			if pinType := p.Type(); pinType != typeStr {
+				t.Fatalf("returned wrong pin type: expected %s, got %s", typeStr, pinType)
+			}
+
+			if c := p.Path().Cid(); !pinProps.Has(c) {
+				t.Fatalf("%s expected to be in pin ls all as type %s", c.String(), typeStr)
+			}
+		}
+	}
+}

From e3b5686710f471a15d736c62ef2f6e66bbbec8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <michael.mure@consensys.net>
Date: Wed, 27 Nov 2019 21:40:22 +0100
Subject: [PATCH 225/247] feat: make the CoreAPI expose a streaming pin
 interface

This commit was moved from ipfs/interface-go-ipfs-core@f976af7ba62d0209b53aeef72fb102c4387d3f00

This commit was moved from ipfs/boxo@6eb5c9791b91da125d269d84b201d0acc8e7657a
---
 core/coreiface/pin.go          |  5 ++++-
 core/coreiface/tests/block.go  |  2 +-
 core/coreiface/tests/pin.go    | 39 ++++++++++++++++++++++++----------
 core/coreiface/tests/unixfs.go |  2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 7df2956f0..27f9355d3 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -14,6 +14,9 @@ type Pin interface {
 
 	// Type of the pin
 	Type() string
+
+	// if not nil, an error happened. Everything else should be ignored.
+	Err() error
 }
 
 // PinStatus holds information about pin health
@@ -41,7 +44,7 @@ type PinAPI interface {
 	Add(context.Context, path.Path, ...options.PinAddOption) error
 
 	// Ls returns list of pinned objects on this node
-	Ls(context.Context, ...options.PinLsOption) ([]Pin, error)
+	Ls(context.Context, ...options.PinLsOption) (<-chan Pin, error)
 
 	// Rm removes pin for object specified by the path
 	Rm(context.Context, path.Path, ...options.PinRmOption) error
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 6b648f394..2048dd4c2 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -225,7 +225,7 @@ func (tp *TestSuite) TestBlockPin(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	pins, err := api.Pin().Ls(ctx)
+	pins, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		return
 	}
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 7e574fa0d..a968490d3 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -67,7 +67,7 @@ func (tp *TestSuite) TestPinSimple(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	list, err := api.Pin().Ls(ctx)
+	list, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,7 +89,7 @@ func (tp *TestSuite) TestPinSimple(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	list, err = api.Pin().Ls(ctx)
+	list, err = accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -141,7 +141,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	list, err := api.Pin().Ls(ctx)
+	list, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -150,7 +150,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Direct())
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Direct()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -163,7 +163,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpfsPath(nd2.Cid()).String())
 	}
 
-	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Recursive()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -176,7 +176,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpldPath(nd3.Cid()).String())
 	}
 
-	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Indirect()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -390,21 +390,21 @@ func getThreeChainedNodes(t *testing.T, ctx context.Context, api iface.CoreAPI,
 func assertPinTypes(t *testing.T, ctx context.Context, api iface.CoreAPI, recusive, direct, indirect []cidContainer) {
 	assertPinLsAllConsistency(t, ctx, api)
 
-	list, err := api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
+	list, err := accPins(api.Pin().Ls(ctx, opt.Pin.Type.Recursive()))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assertPinCids(t, list, recusive...)
 
-	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Direct())
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Direct()))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assertPinCids(t, list, direct...)
 
-	list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Indirect()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -454,7 +454,7 @@ func assertPinCids(t *testing.T, pins []iface.Pin, cids ...cidContainer) {
 // assertPinLsAllConsistency verifies that listing all pins gives the same result as listing the pin types individually
 func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.CoreAPI) {
 	t.Helper()
-	allPins, err := api.Pin().Ls(ctx)
+	allPins, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -485,7 +485,7 @@ func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.Core
 	}
 
 	for typeStr, pinProps := range typeMap {
-		pins, err := api.Pin().Ls(ctx, pinProps.PinLsOption)
+		pins, err := accPins(api.Pin().Ls(ctx, pinProps.PinLsOption))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -505,3 +505,20 @@ func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.Core
 		}
 	}
 }
+
+func accPins(pins <-chan iface.Pin, err error) ([]iface.Pin, error) {
+	if err != nil {
+		return nil, err
+	}
+
+	var result []iface.Pin
+
+	for pin := range pins {
+		if pin.Err() != nil {
+			return nil, pin.Err()
+		}
+		result = append(result, pin)
+	}
+
+	return result, nil
+}
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index aac7fa92f..1ed80e873 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -542,7 +542,7 @@ func (tp *TestSuite) TestAddPinned(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	pins, err := api.Pin().Ls(ctx)
+	pins, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
 		t.Fatal(err)
 	}

From 8eff544241ee85a27617c0146dcaaae8054e4b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Fri, 29 Nov 2019 22:21:29 +0100
Subject: [PATCH 226/247] fix some tests

This commit was moved from ipfs/interface-go-ipfs-core@48dcedecd468c06e3321b4217b51f67180d07eec

This commit was moved from ipfs/boxo@689e92b560ca2404db9edd1e8b65cd1a5e929881
---
 core/coreiface/tests/block.go | 2 +-
 core/coreiface/tests/pin.go   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 2048dd4c2..51c099bd0 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -227,7 +227,7 @@ func (tp *TestSuite) TestBlockPin(t *testing.T) {
 
 	pins, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
-		return
+		t.Skip(err)
 	}
 	if len(pins) != 1 {
 		t.Fatal("expected 1 pin")
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index a968490d3..58e812084 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -160,7 +160,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 	}
 
 	if list[0].Path().String() != path.IpldPath(nd3.Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpfsPath(nd2.Cid()).String())
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpfsPath(nd3.Cid()).String())
 	}
 
 	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Recursive()))
@@ -173,7 +173,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 	}
 
 	if list[0].Path().String() != path.IpldPath(nd2.Cid()).String() {
-		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpldPath(nd3.Cid()).String())
+		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpldPath(nd2.Cid()).String())
 	}
 
 	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Indirect()))
@@ -186,7 +186,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 	}
 
 	if list[0].Path().Cid().String() != p0.Cid().String() {
-		t.Error("unexpected path")
+		t.Errorf("unexpected path, %s != %s", list[0].Path().Cid().String(), p0.Cid().String())
 	}
 
 	res, err := api.Pin().Verify(ctx)

From e5059d9e1de51229ce49b275665903d9511adffb Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 2 Dec 2019 15:04:28 -0500
Subject: [PATCH 227/247] fix(tests): put valid blocks

This commit was moved from ipfs/interface-go-ipfs-core@16127b291793c593b78fb2909bbaf106612ffc30

This commit was moved from ipfs/boxo@b1c5044d1541aa39ed8e6fff8f47c71bf012a7eb
---
 core/coreiface/tests/block.go | 52 ++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 51c099bd0..09a36b5fe 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -1,18 +1,34 @@
 package tests
 
 import (
+	"bytes"
 	"context"
-	"github.com/ipfs/interface-go-ipfs-core/path"
+	"io"
 	"io/ioutil"
 	"strings"
 	"testing"
 
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 
 	mh "github.com/multiformats/go-multihash"
 )
 
+var (
+	pbCid    = "QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN"
+	cborCid  = "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm"
+	cborKCid = "bafyr2qgsohbwdlk7ajmmbb4lhoytmest4wdbe5xnexfvtxeatuyqqmwv3fgxp3pmhpc27gwey2cct56gloqefoqwcf3yqiqzsaqb7p4jefhcw"
+)
+
+func pbBlock() io.Reader {
+	return bytes.NewReader([]byte{10, 12, 8, 2, 18, 6, 104, 101, 108, 108, 111, 10, 24, 6})
+}
+
+func cborBlock() io.Reader {
+	return bytes.NewReader([]byte{101, 72, 101, 108, 108, 111})
+}
+
 func (tp *TestSuite) TestBlock(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Block() == nil {
@@ -38,12 +54,12 @@ func (tp *TestSuite) TestBlockPut(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	res, err := api.Block().Put(ctx, pbBlock())
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != "QmPyo15ynbVrSTVdJL9th7JysHaAbXt9dM9tXk1bMHbRtk" {
+	if res.Path().Cid().String() != pbCid {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
@@ -56,12 +72,12 @@ func (tp *TestSuite) TestBlockPutFormat(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("cbor"))
+	res, err := api.Block().Put(ctx, cborBlock(), opt.Block.Format("cbor"))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != "bafyreiayl6g3gitr7ys7kyng7sjywlrgimdoymco3jiyab6rozecmoazne" {
+	if res.Path().Cid().String() != cborCid {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
@@ -74,12 +90,17 @@ func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
+	res, err := api.Block().Put(
+		ctx,
+		cborBlock(),
+		opt.Block.Hash(mh.KECCAK_512, -1),
+		opt.Block.Format("cbor"),
+	)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != "bafyb2qgdh7w6dcq24u65xbtdoehyavegnpvxcqce7ttvs6ielgmwdfxrahmu37d33atik57x5y6s7d7qz32aasuwgirh3ocn6ywswqdifvu6e" {
+	if res.Path().Cid().String() != cborKCid {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
@@ -92,7 +113,7 @@ func (tp *TestSuite) TestBlockGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Hash(mh.KECCAK_512, -1))
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("raw"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -130,7 +151,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("raw"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -184,7 +205,7 @@ func (tp *TestSuite) TestBlockStat(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`))
+	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("raw"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -211,7 +232,7 @@ func (tp *TestSuite) TestBlockPin(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = api.Block().Put(ctx, strings.NewReader(`Hello`))
+	_, err = api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Format("raw"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -220,14 +241,19 @@ func (tp *TestSuite) TestBlockPin(t *testing.T) {
 		t.Fatal("expected 0 pins")
 	}
 
-	res, err := api.Block().Put(ctx, strings.NewReader(`Hello`), opt.Block.Pin(true))
+	res, err := api.Block().Put(
+		ctx,
+		strings.NewReader(`Hello`),
+		opt.Block.Pin(true),
+		opt.Block.Format("raw"),
+	)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	pins, err := accPins(api.Pin().Ls(ctx))
 	if err != nil {
-		t.Skip(err)
+		t.Fatal(err)
 	}
 	if len(pins) != 1 {
 		t.Fatal("expected 1 pin")

From 80a898dd552426b37593889eaa68b870f4c0cfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Wed, 22 Jan 2020 17:11:19 +0100
Subject: [PATCH 228/247] test: fail early on err to avoid an unrelated panic

This commit was moved from ipfs/interface-go-ipfs-core@df21c57e0f09b481b02f09cf3da20d17d25414e9

This commit was moved from ipfs/boxo@7a2fc1b8165e4079351f62ed4eec6a3fd9bd0aac
---
 core/coreiface/tests/block.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 6b648f394..3777d2259 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -156,7 +156,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 
 	_, err = api.Block().Get(ctx, res.Path())
 	if err == nil {
-		t.Error("expected err to exist")
+		t.Fatal("expected err to exist")
 	}
 	if !strings.Contains(err.Error(), "blockservice: key not found") {
 		t.Errorf("unexpected error; %s", err.Error())
@@ -164,7 +164,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 
 	err = api.Block().Rm(ctx, res.Path())
 	if err == nil {
-		t.Error("expected err to exist")
+		t.Fatal("expected err to exist")
 	}
 	if !strings.Contains(err.Error(), "blockstore: block not found") {
 		t.Errorf("unexpected error; %s", err.Error())

From b52034068c6f306f3d111b3dfce9427535127e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Fri, 29 Nov 2019 22:33:13 +0100
Subject: [PATCH 229/247] pin: add a IsPinned method

This commit was moved from ipfs/interface-go-ipfs-core@c82db2ef2270a228185aaba6b08ecd7157a7ebee

This commit was moved from ipfs/boxo@e84cc0569818ce3b28ff7ea27b5077fe17232163
---
 core/coreiface/options/pin.go | 198 ++++++++++++++++++++++++++--------
 core/coreiface/pin.go         |   4 +
 core/coreiface/tests/pin.go   |  95 ++++++++++++++--
 3 files changed, 244 insertions(+), 53 deletions(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 6b211bb73..231f0d11a 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -1,13 +1,23 @@
 package options
 
+import "fmt"
+
 type PinAddSettings struct {
 	Recursive bool
 }
 
+type TypeSettings struct {
+	Type string
+}
+
 type PinLsSettings struct {
 	Type string
 }
 
+type PinIsPinnedSettings struct {
+	WithType string
+}
+
 // PinRmSettings represents the settings of pin rm command
 type PinRmSettings struct {
 	Recursive bool
@@ -17,13 +27,19 @@ type PinUpdateSettings struct {
 	Unpin bool
 }
 
+// PinAddOption pin add option func
 type PinAddOption func(*PinAddSettings) error
 
+// PinLsOption pin ls option func
+type PinLsOption func(*PinLsSettings) error
+
+// PinIsPinnedOption pin isPinned option func
+type PinIsPinnedOption func(*PinIsPinnedSettings) error
+
 // PinRmOption pin rm option func
 type PinRmOption func(*PinRmSettings) error
 
-// PinLsOption pin ls option func
-type PinLsOption func(*PinLsSettings) error
+// PinUpdateOption pin update option func
 type PinUpdateOption func(*PinUpdateSettings) error
 
 func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
@@ -41,6 +57,36 @@ func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
 	return options, nil
 }
 
+func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
+	options := &PinLsSettings{
+		Type: "all",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+func PinIsPinnedOptions(opts ...PinIsPinnedOption) (*PinIsPinnedSettings, error) {
+	options := &PinIsPinnedSettings{
+		WithType: "all",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
 // PinRmOptions pin rm options
 func PinRmOptions(opts ...PinRmOption) (*PinRmSettings, error) {
 	options := &PinRmSettings{
@@ -56,21 +102,6 @@ func PinRmOptions(opts ...PinRmOption) (*PinRmSettings, error) {
 	return options, nil
 }
 
-func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
-	options := &PinLsSettings{
-		Type: "all",
-	}
-
-	for _, opt := range opts {
-		err := opt(options)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return options, nil
-}
-
 func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
 	options := &PinUpdateSettings{
 		Unpin: true,
@@ -86,36 +117,131 @@ func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
 	return options, nil
 }
 
-type pinType struct{}
-
 type pinOpts struct {
-	Type pinType
+	Ls       pinLsOpts
+	IsPinned pinIsPinnedOpts
 }
 
 var Pin pinOpts
 
+type pinLsOpts struct{}
+
 // All is an option for Pin.Ls which will make it return all pins. It is
 // the default
-func (pinType) All() PinLsOption {
-	return Pin.pinType("all")
+func (pinLsOpts) All() PinLsOption {
+	return Pin.Ls.pinType("all")
 }
 
 // Recursive is an option for Pin.Ls which will make it only return recursive
 // pins
-func (pinType) Recursive() PinLsOption {
-	return Pin.pinType("recursive")
+func (pinLsOpts) Recursive() PinLsOption {
+	return Pin.Ls.pinType("recursive")
 }
 
 // Direct is an option for Pin.Ls which will make it only return direct (non
 // recursive) pins
-func (pinType) Direct() PinLsOption {
-	return Pin.pinType("direct")
+func (pinLsOpts) Direct() PinLsOption {
+	return Pin.Ls.pinType("direct")
 }
 
 // Indirect is an option for Pin.Ls which will make it only return indirect pins
 // (objects referenced by other recursively pinned objects)
-func (pinType) Indirect() PinLsOption {
-	return Pin.pinType("indirect")
+func (pinLsOpts) Indirect() PinLsOption {
+	return Pin.Ls.pinType("indirect")
+}
+
+// Type is an option for Pin.Ls which will make it only return pins of the given
+// type.
+//
+// Supported values:
+// * "direct" - directly pinned objects
+// * "recursive" - roots of recursive pins
+// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+//    objects)
+// * "all" - all pinned objects (default)
+func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
+	switch typeStr {
+	case "all", "direct", "indirect", "recursive":
+		return Pin.Ls.pinType(typeStr), nil
+	default:
+		return nil, fmt.Errorf("invalid type '%s', must be one of {direct, indirect, recursive, all}", typeStr)
+	}
+}
+
+// pinType is an option for Pin.Ls which allows to specify which pin types should
+// be returned
+//
+// Supported values:
+// * "direct" - directly pinned objects
+// * "recursive" - roots of recursive pins
+// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+//    objects)
+// * "all" - all pinned objects (default)
+func (pinLsOpts) pinType(t string) PinLsOption {
+	return func(settings *PinLsSettings) error {
+		settings.Type = t
+		return nil
+	}
+}
+
+type pinIsPinnedOpts struct{}
+
+// All is an option for Pin.IsPinned which will make it search in all type of pins.
+// It is the default
+func (pinIsPinnedOpts) All() PinIsPinnedOption {
+	return Pin.IsPinned.pinType("all")
+}
+
+// Recursive is an option for Pin.IsPinned which will make it only search in
+// recursive pins
+func (pinIsPinnedOpts) Recursive() PinIsPinnedOption {
+	return Pin.IsPinned.pinType("recursive")
+}
+
+// Direct is an option for Pin.IsPinned which will make it only search in direct
+// (non recursive) pins
+func (pinIsPinnedOpts) Direct() PinIsPinnedOption {
+	return Pin.IsPinned.pinType("direct")
+}
+
+// Indirect is an option for Pin.IsPinned which will make it only search indirect
+// pins (objects referenced by other recursively pinned objects)
+func (pinIsPinnedOpts) Indirect() PinIsPinnedOption {
+	return Pin.IsPinned.pinType("indirect")
+}
+
+// Type is an option for Pin.IsPinned which will make it only search pins of the given
+// type.
+//
+// Supported values:
+// * "direct" - directly pinned objects
+// * "recursive" - roots of recursive pins
+// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+//    objects)
+// * "all" - all pinned objects (default)
+func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
+	switch typeStr {
+	case "all", "direct", "indirect", "recursive":
+		return Pin.IsPinned.pinType(typeStr), nil
+	default:
+		return nil, fmt.Errorf("invalid type '%s', must be one of {direct, indirect, recursive, all}", typeStr)
+	}
+}
+
+// pinType is an option for Pin.IsPinned which allows to specify which pin type the given
+// pin is expected to be, speeding up the research.
+//
+// Supported values:
+// * "direct" - directly pinned objects
+// * "recursive" - roots of recursive pins
+// * "indirect" - indirectly pinned objects (referenced by recursively pinned
+//    objects)
+// * "all" - all pinned objects (default)
+func (pinIsPinnedOpts) pinType(t string) PinIsPinnedOption {
+	return func(settings *PinIsPinnedSettings) error {
+		settings.WithType = t
+		return nil
+	}
 }
 
 // Recursive is an option for Pin.Add which specifies whether to pin an entire
@@ -137,22 +263,6 @@ func (pinOpts) RmRecursive(recursive bool) PinRmOption {
 	}
 }
 
-// Type is an option for Pin.Ls which allows to specify which pin types should
-// be returned
-//
-// Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
-func (pinOpts) pinType(t string) PinLsOption {
-	return func(settings *PinLsSettings) error {
-		settings.Type = t
-		return nil
-	}
-}
-
 // Unpin is an option for Pin.Update which specifies whether to remove the old pin.
 // Default is true.
 func (pinOpts) Unpin(unpin bool) PinUpdateOption {
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 27f9355d3..4c1788c68 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -46,6 +46,10 @@ type PinAPI interface {
 	// Ls returns list of pinned objects on this node
 	Ls(context.Context, ...options.PinLsOption) (<-chan Pin, error)
 
+	// IsPinned returns whether or not the given cid is pinned
+	// and an explanation of why its pinned
+	IsPinned(context.Context, path.Path, ...options.PinIsPinnedOption) (string, bool, error)
+
 	// Rm removes pin for object specified by the path
 	Rm(context.Context, path.Path, ...options.PinRmOption) error
 
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 58e812084..e16d6460b 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -28,6 +28,7 @@ func (tp *TestSuite) TestPin(t *testing.T) {
 	t.Run("TestPinRecursive", tp.TestPinRecursive)
 	t.Run("TestPinLsIndirect", tp.TestPinLsIndirect)
 	t.Run("TestPinLsPrecedence", tp.TestPinLsPrecedence)
+	t.Run("TestPinIsPinned", tp.TestPinIsPinned)
 }
 
 func (tp *TestSuite) TestPinAdd(t *testing.T) {
@@ -84,6 +85,8 @@ func (tp *TestSuite) TestPinSimple(t *testing.T) {
 		t.Error("unexpected pin type")
 	}
 
+	assertIsPinned(t, ctx, api, p, "recursive")
+
 	err = api.Pin().Rm(ctx, p)
 	if err != nil {
 		t.Fatal(err)
@@ -150,7 +153,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected pin list len: %d", len(list))
 	}
 
-	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Direct()))
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Direct()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -163,7 +166,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpfsPath(nd3.Cid()).String())
 	}
 
-	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Recursive()))
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Recursive()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -176,7 +179,7 @@ func (tp *TestSuite) TestPinRecursive(t *testing.T) {
 		t.Errorf("unexpected path, %s != %s", list[0].Path().String(), path.IpldPath(nd2.Cid()).String())
 	}
 
-	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Indirect()))
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Indirect()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -360,6 +363,39 @@ func (tp *TestSuite) TestPinLsPrecedenceRecursiveDirect(t *testing.T) {
 	assertPinTypes(t, ctx, api, []cidContainer{grandparent, parent}, []cidContainer{}, []cidContainer{leaf})
 }
 
+func (tp *TestSuite) TestPinIsPinned(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	leaf, parent, grandparent := getThreeChainedNodes(t, ctx, api, "foofoo")
+
+	assertNotPinned(t, ctx, api, path.IpldPath(grandparent.Cid()))
+	assertNotPinned(t, ctx, api, path.IpldPath(parent.Cid()))
+	assertNotPinned(t, ctx, api, path.IpldPath(leaf.Cid()))
+
+	err = api.Pin().Add(ctx, path.IpldPath(parent.Cid()), opt.Pin.Recursive(true))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertNotPinned(t, ctx, api, path.IpldPath(grandparent.Cid()))
+	assertIsPinned(t, ctx, api, path.IpldPath(parent.Cid()), "recursive")
+	assertIsPinned(t, ctx, api, path.IpldPath(leaf.Cid()), "indirect")
+
+	err = api.Pin().Add(ctx, path.IpldPath(grandparent.Cid()), opt.Pin.Recursive(false))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assertIsPinned(t, ctx, api, path.IpldPath(grandparent.Cid()), "direct")
+	assertIsPinned(t, ctx, api, path.IpldPath(parent.Cid()), "recursive")
+	assertIsPinned(t, ctx, api, path.IpldPath(leaf.Cid()), "indirect")
+}
+
 type cidContainer interface {
 	Cid() cid.Cid
 }
@@ -390,21 +426,21 @@ func getThreeChainedNodes(t *testing.T, ctx context.Context, api iface.CoreAPI,
 func assertPinTypes(t *testing.T, ctx context.Context, api iface.CoreAPI, recusive, direct, indirect []cidContainer) {
 	assertPinLsAllConsistency(t, ctx, api)
 
-	list, err := accPins(api.Pin().Ls(ctx, opt.Pin.Type.Recursive()))
+	list, err := accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Recursive()))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assertPinCids(t, list, recusive...)
 
-	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Direct()))
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Direct()))
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assertPinCids(t, list, direct...)
 
-	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Type.Indirect()))
+	list, err = accPins(api.Pin().Ls(ctx, opt.Pin.Ls.Indirect()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -466,9 +502,9 @@ func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.Core
 
 	all, recursive, direct, indirect := cid.NewSet(), cid.NewSet(), cid.NewSet(), cid.NewSet()
 	typeMap := map[string]*pinTypeProps{
-		"recursive": {recursive, opt.Pin.Type.Recursive()},
-		"direct":    {direct, opt.Pin.Type.Direct()},
-		"indirect":  {indirect, opt.Pin.Type.Indirect()},
+		"recursive": {recursive, opt.Pin.Ls.Recursive()},
+		"direct":    {direct, opt.Pin.Ls.Direct()},
+		"indirect":  {indirect, opt.Pin.Ls.Indirect()},
 	}
 
 	for _, p := range allPins {
@@ -506,6 +542,47 @@ func assertPinLsAllConsistency(t *testing.T, ctx context.Context, api iface.Core
 	}
 }
 
+func assertIsPinned(t *testing.T, ctx context.Context, api iface.CoreAPI, p path.Path, typeStr string) {
+	t.Helper()
+	withType, err := opt.Pin.IsPinned.Type(typeStr)
+	if err != nil {
+		panic("unhandled pin type")
+	}
+
+	whyPinned, pinned, err := api.Pin().IsPinned(ctx, p, withType)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !pinned {
+		t.Fatalf("%s expected to be pinned with type %s", p, typeStr)
+	}
+
+	switch typeStr {
+	case "recursive", "direct":
+		if typeStr != whyPinned {
+			t.Fatalf("reason for pinning expected to be %s for %s, got %s", typeStr, p, whyPinned)
+		}
+	case "indirect":
+		if whyPinned == "" {
+			t.Fatalf("expected to have a pin reason for %s", p)
+		}
+	}
+}
+
+func assertNotPinned(t *testing.T, ctx context.Context, api iface.CoreAPI, p path.Path) {
+	t.Helper()
+
+	_, pinned, err := api.Pin().IsPinned(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if pinned {
+		t.Fatalf("%s expected to not be pinned", p)
+	}
+}
+
 func accPins(pins <-chan iface.Pin, err error) ([]iface.Pin, error) {
 	if err != nil {
 		return nil, err

From 7f07bf09966647107c25bbe8e60be1803c7496fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Mon, 30 Mar 2020 16:20:15 +0200
Subject: [PATCH 230/247] pin: better doc, small cleaning

This commit was moved from ipfs/interface-go-ipfs-core@478caf05ab8fd3b33ae80f8792be2cb7c7a92b45

This commit was moved from ipfs/boxo@bffa011f0a0f01646bcecbc003552941ca31860b
---
 core/coreiface/options/pin.go | 32 +++++++++++++++++++++-----------
 core/coreiface/tests/pin.go   |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 231f0d11a..5014a2d2b 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -2,46 +2,48 @@ package options
 
 import "fmt"
 
+// PinAddSettings represent the settings for PinAPI.Add
 type PinAddSettings struct {
 	Recursive bool
 }
 
-type TypeSettings struct {
-	Type string
-}
-
+// PinLsSettings represent the settings for PinAPI.Ls
 type PinLsSettings struct {
 	Type string
 }
 
+// PinIsPinnedSettings represent the settings for PinAPI.IsPinned
 type PinIsPinnedSettings struct {
 	WithType string
 }
 
-// PinRmSettings represents the settings of pin rm command
+// PinRmSettings represents the settings for PinAPI.Rm
 type PinRmSettings struct {
 	Recursive bool
 }
 
+// PinUpdateSettings represent the settings for PinAPI.Update
 type PinUpdateSettings struct {
 	Unpin bool
 }
 
-// PinAddOption pin add option func
+// PinAddOption is the signature of an option for PinAPI.Add
 type PinAddOption func(*PinAddSettings) error
 
-// PinLsOption pin ls option func
+// PinLsOption is the signature of an option for PinAPI.Ls
 type PinLsOption func(*PinLsSettings) error
 
-// PinIsPinnedOption pin isPinned option func
+// PinIsPinnedOption is the signature of an option for PinAPI.IsPinned
 type PinIsPinnedOption func(*PinIsPinnedSettings) error
 
-// PinRmOption pin rm option func
+// PinRmOption is the signature of an option for PinAPI.Rm
 type PinRmOption func(*PinRmSettings) error
 
-// PinUpdateOption pin update option func
+// PinUpdateOption is the signature of an option for PinAPI.Update
 type PinUpdateOption func(*PinUpdateSettings) error
 
+// PinAddOptions compile a series of PinAddOption into a ready to use
+// PinAddSettings and set the default values.
 func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
 	options := &PinAddSettings{
 		Recursive: true,
@@ -57,6 +59,8 @@ func PinAddOptions(opts ...PinAddOption) (*PinAddSettings, error) {
 	return options, nil
 }
 
+// PinLsOptions compile a series of PinLsOption into a ready to use
+// PinLsSettings and set the default values.
 func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
 	options := &PinLsSettings{
 		Type: "all",
@@ -72,6 +76,8 @@ func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
 	return options, nil
 }
 
+// PinIsPinnedOptions compile a series of PinIsPinnedOption into a ready to use
+// PinIsPinnedSettings and set the default values.
 func PinIsPinnedOptions(opts ...PinIsPinnedOption) (*PinIsPinnedSettings, error) {
 	options := &PinIsPinnedSettings{
 		WithType: "all",
@@ -87,7 +93,8 @@ func PinIsPinnedOptions(opts ...PinIsPinnedOption) (*PinIsPinnedSettings, error)
 	return options, nil
 }
 
-// PinRmOptions pin rm options
+// PinRmOptions compile a series of PinRmOption into a ready to use
+// PinRmSettings and set the default values.
 func PinRmOptions(opts ...PinRmOption) (*PinRmSettings, error) {
 	options := &PinRmSettings{
 		Recursive: true,
@@ -102,6 +109,8 @@ func PinRmOptions(opts ...PinRmOption) (*PinRmSettings, error) {
 	return options, nil
 }
 
+// PinUpdateOptions compile a series of PinUpdateOption into a ready to use
+// PinUpdateSettings and set the default values.
 func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
 	options := &PinUpdateSettings{
 		Unpin: true,
@@ -122,6 +131,7 @@ type pinOpts struct {
 	IsPinned pinIsPinnedOpts
 }
 
+// Pin provide an access to all the options for the Pin API.
 var Pin pinOpts
 
 type pinLsOpts struct{}
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index e16d6460b..476bbea6b 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -546,7 +546,7 @@ func assertIsPinned(t *testing.T, ctx context.Context, api iface.CoreAPI, p path
 	t.Helper()
 	withType, err := opt.Pin.IsPinned.Type(typeStr)
 	if err != nil {
-		panic("unhandled pin type")
+		t.Fatal("unhandled pin type")
 	}
 
 	whyPinned, pinned, err := api.Pin().IsPinned(ctx, p, withType)

From 3a48c527193cc7688f488da875bb065459a12809 Mon Sep 17 00:00:00 2001
From: Will Scott <will@cypherpunk.email>
Date: Tue, 21 Apr 2020 08:40:13 -0700
Subject: [PATCH 231/247] extra time for dht spin-up

This commit was moved from ipfs/interface-go-ipfs-core@9160e645322d5779c687e0e60cbec5a5932d5c27

This commit was moved from ipfs/boxo@0ed0b6f39d3ab3b20bd6dd2232de03a9513b139c
---
 core/coreiface/tests/dht.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index 33b4ff14c..a957d66d7 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -4,8 +4,9 @@ import (
 	"context"
 	"io"
 	"testing"
+	"time"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
@@ -43,6 +44,8 @@ func (tp *TestSuite) TestDhtFindPeer(t *testing.T) {
 		t.Fatal("unexpected number of local addrs")
 	}
 
+	time.Sleep(3 * time.Second)
+
 	pi, err := apis[2].Dht().FindPeer(ctx, self0.ID())
 	if err != nil {
 		t.Fatal(err)
@@ -88,6 +91,8 @@ func (tp *TestSuite) TestDhtFindProviders(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	time.Sleep(3 * time.Second)
+
 	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
 	if err != nil {
 		t.Fatal(err)
@@ -125,6 +130,8 @@ func (tp *TestSuite) TestDhtProvide(t *testing.T) {
 
 	p := s.Path()
 
+	time.Sleep(3 * time.Second)
+
 	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
 	if err != nil {
 		t.Fatal(err)

From 2517d0b9d49911add8b923a48030e4f7cbf0a0b9 Mon Sep 17 00:00:00 2001
From: Petar Maymounkov <petarm@gmail.com>
Date: Wed, 22 Jul 2020 09:05:14 -0700
Subject: [PATCH 232/247] add id and key formatting utils; format keys as
 b36cid by default; update tests

This commit was moved from ipfs/interface-go-ipfs-core@c604c5b0338c075046d7ddf0b60c5927500607d3

This commit was moved from ipfs/boxo@7bcd64373825dfda1ef91c9d9157a5328928cc09
---
 core/coreiface/idfmt.go      | 19 ++++++++++++++
 core/coreiface/tests/key.go  | 49 +++++++++++++++++++++++-------------
 core/coreiface/tests/name.go | 30 +++++++++++-----------
 3 files changed, 66 insertions(+), 32 deletions(-)
 create mode 100644 core/coreiface/idfmt.go

diff --git a/core/coreiface/idfmt.go b/core/coreiface/idfmt.go
new file mode 100644
index 000000000..1ba79e602
--- /dev/null
+++ b/core/coreiface/idfmt.go
@@ -0,0 +1,19 @@
+package iface
+
+import (
+	peer "github.com/libp2p/go-libp2p-core/peer"
+	mbase "github.com/multiformats/go-multibase"
+)
+
+func FormatKeyID(id peer.ID) string {
+	if s, err := peer.ToCid(id).StringOfBase(mbase.Base36); err != nil {
+		panic(err)
+	} else {
+		return s
+	}
+}
+
+// FormatKey formats the given IPNS key in a canonical way.
+func FormatKey(key Key) string {
+	return FormatKeyID(key.ID())
+}
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 265a8f060..c3cd8626f 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -5,8 +5,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	cid "github.com/ipfs/go-cid"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
+	mbase "github.com/multiformats/go-multibase"
 )
 
 func (tp *TestSuite) TestKey(t *testing.T) {
@@ -64,8 +67,8 @@ func (tp *TestSuite) TestListSelf(t *testing.T) {
 		t.Errorf("expected the key to be called 'self', got '%s'", keys[0].Name())
 	}
 
-	if keys[0].Path().String() != "/ipns/"+self.ID().Pretty() {
-		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", self.ID().Pretty(), keys[0].Path().String())
+	if keys[0].Path().String() != "/ipns/"+coreiface.FormatKeyID(self.ID()) {
+		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", coreiface.FormatKeyID(self.ID()), keys[0].Path().String())
 	}
 }
 
@@ -134,9 +137,30 @@ func (tp *TestSuite) TestGenerate(t *testing.T) {
 		t.Errorf("expected the key to be called 'foo', got '%s'", k.Name())
 	}
 
-	if !strings.HasPrefix(k.Path().String(), "/ipns/Qm") {
-		t.Errorf("expected the key to be prefixed with '/ipns/Qm', got '%s'", k.Path().String())
+	verifyIPNSPath(t, k.Path().String())
+}
+
+func verifyIPNSPath(t *testing.T, p string) bool {
+	t.Helper()
+	if !strings.HasPrefix(p, "/ipns/") {
+		t.Errorf("path %q does not look like an IPNS path", p)
+		return false
 	}
+	k := p[len("/ipns/"):]
+	c, err := cid.Decode(k)
+	if err != nil {
+		t.Errorf("failed to decode IPNS key %q (%v)", k, err)
+		return false
+	}
+	b36, err := c.StringOfBase(mbase.Base36)
+	if err != nil {
+		t.Fatalf("cid cannot format itself in b36")
+		return false
+	}
+	if b36 != k {
+		t.Errorf("IPNS key is not base36")
+	}
+	return true
 }
 
 func (tp *TestSuite) TestGenerateSize(t *testing.T) {
@@ -157,9 +181,7 @@ func (tp *TestSuite) TestGenerateSize(t *testing.T) {
 		t.Errorf("expected the key to be called 'foo', got '%s'", k.Name())
 	}
 
-	if !strings.HasPrefix(k.Path().String(), "/ipns/Qm") {
-		t.Errorf("expected the key to be prefixed with '/ipns/Qm', got '%s'", k.Path().String())
-	}
+	verifyIPNSPath(t, k.Path().String())
 }
 
 func (tp *TestSuite) TestGenerateType(t *testing.T) {
@@ -256,15 +278,8 @@ func (tp *TestSuite) TestList(t *testing.T) {
 		return
 	}
 
-	if !strings.HasPrefix(l[0].Path().String(), "/ipns/Qm") {
-		t.Fatalf("expected key 0 to be prefixed with '/ipns/Qm', got '%s'", l[0].Name())
-		return
-	}
-
-	if !strings.HasPrefix(l[1].Path().String(), "/ipns/Qm") {
-		t.Fatalf("expected key 1 to be prefixed with '/ipns/Qm', got '%s'", l[1].Name())
-		return
-	}
+	verifyIPNSPath(t, l[0].Path().String())
+	verifyIPNSPath(t, l[1].Path().String())
 }
 
 func (tp *TestSuite) TestRename(t *testing.T) {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 31a5c1466..021c1bb97 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -2,15 +2,15 @@ package tests
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 	"math/rand"
 	gopath "path"
 	"testing"
 	"time"
 
-	"github.com/ipfs/go-ipfs-files"
-	ipath "github.com/ipfs/go-path"
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
+	files "github.com/ipfs/go-ipfs-files"
 
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
@@ -70,8 +70,8 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if e.Name() != self.ID().Pretty() {
-				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			if e.Name() != coreiface.FormatKeyID(self.ID()) {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", coreiface.FormatKeyID(self.ID()), e.Name())
 			}
 
 			if e.Value().String() != p.String() {
@@ -100,8 +100,8 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if e.Name() != self.ID().Pretty() {
-				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			if e.Name() != coreiface.FormatKeyID(self.ID()) {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", coreiface.FormatKeyID(self.ID()), e.Name())
 			}
 
 			if e.Value().String() != p.String()+"/test" {
@@ -130,8 +130,8 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if e.Name() != self.ID().Pretty() {
-				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			if e.Name() != coreiface.FormatKeyID(self.ID()) {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", coreiface.FormatKeyID(self.ID()), e.Name())
 			}
 
 			if e.Value().String() != p.String() {
@@ -160,8 +160,8 @@ func (tp *TestSuite) TestPublishResolve(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if e.Name() != self.ID().Pretty() {
-				t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+			if e.Name() != coreiface.FormatKeyID(self.ID()) {
+				t.Errorf("expected e.Name to equal '%s', got '%s'", coreiface.FormatKeyID(self.ID()), e.Name())
 			}
 
 			if e.Value().String() != p.String()+"/a" {
@@ -212,8 +212,8 @@ func (tp *TestSuite) TestBasicPublishResolveKey(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if ipath.Join([]string{"/ipns", e.Name()}) != k.Path().String() {
-		t.Errorf("expected e.Name to equal '%s', got '%s'", e.Name(), k.Path().String())
+	if e.Name() != coreiface.FormatKey(k) {
+		t.Errorf("expected e.Name to equal %s, got '%s'", e.Name(), coreiface.FormatKey(k))
 	}
 
 	if e.Value().String() != p.String() {
@@ -255,8 +255,8 @@ func (tp *TestSuite) TestBasicPublishResolveTimeout(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if e.Name() != self.ID().Pretty() {
-		t.Errorf("expected e.Name to equal '%s', got '%s'", self.ID().Pretty(), e.Name())
+	if e.Name() != coreiface.FormatKeyID(self.ID()) {
+		t.Errorf("expected e.Name to equal '%s', got '%s'", coreiface.FormatKeyID(self.ID()), e.Name())
 	}
 
 	if e.Value().String() != p.String() {

From fb0a7edf12a24be1b80fc5a487c183e70048062a Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 2 Jun 2021 09:11:14 -0700
Subject: [PATCH 233/247] fix staticcheck

This commit was moved from ipfs/interface-go-ipfs-core@08bd316e61238880f341d7061c518c2a62830bd9

This commit was moved from ipfs/boxo@5df09f84256c8b490f356c161c96b49d3a46bfd0
---
 core/coreiface/tests/api.go    |  2 +-
 core/coreiface/tests/block.go  |  2 +-
 core/coreiface/tests/dag.go    |  2 +-
 core/coreiface/tests/dht.go    |  2 +-
 core/coreiface/tests/key.go    | 12 ++++++------
 core/coreiface/tests/name.go   |  2 +-
 core/coreiface/tests/object.go |  2 +-
 core/coreiface/tests/pin.go    |  2 +-
 core/coreiface/tests/pubsub.go |  2 +-
 core/coreiface/tests/unixfs.go |  5 ++---
 10 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 1af3a83b3..0801b3ca7 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -9,7 +9,7 @@ import (
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 )
 
-var apiNotImplemented = errors.New("api not implemented")
+var errAPINotImplemented = errors.New("api not implemented")
 
 func (tp *TestSuite) makeAPI(ctx context.Context) (coreiface.CoreAPI, error) {
 	api, err := tp.MakeAPISwarm(ctx, false, 1)
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 1f7252547..7dbfa4df0 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -32,7 +32,7 @@ func cborBlock() io.Reader {
 func (tp *TestSuite) TestBlock(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Block() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 2f68bbf05..6f9d9659e 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -18,7 +18,7 @@ import (
 func (tp *TestSuite) TestDag(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Dag() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index a957d66d7..c2e6d690f 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -13,7 +13,7 @@ import (
 func (tp *TestSuite) TestDht(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Dht() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index c3cd8626f..47f278f97 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -5,8 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	cid "github.com/ipfs/go-cid"
-	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/go-cid"
 	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 	mbase "github.com/multiformats/go-multibase"
@@ -15,7 +14,7 @@ import (
 func (tp *TestSuite) TestKey(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Key() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
@@ -67,8 +66,8 @@ func (tp *TestSuite) TestListSelf(t *testing.T) {
 		t.Errorf("expected the key to be called 'self', got '%s'", keys[0].Name())
 	}
 
-	if keys[0].Path().String() != "/ipns/"+coreiface.FormatKeyID(self.ID()) {
-		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", coreiface.FormatKeyID(self.ID()), keys[0].Path().String())
+	if keys[0].Path().String() != "/ipns/"+iface.FormatKeyID(self.ID()) {
+		t.Errorf("expected the key to have path '/ipns/%s', got '%s'", iface.FormatKeyID(self.ID()), keys[0].Path().String())
 	}
 }
 
@@ -185,9 +184,10 @@ func (tp *TestSuite) TestGenerateSize(t *testing.T) {
 }
 
 func (tp *TestSuite) TestGenerateType(t *testing.T) {
+	t.Skip("disabled until libp2p/specs#111 is fixed")
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	t.Skip("disabled until libp2p/specs#111 is fixed")
 
 	api, err := tp.makeAPI(ctx)
 	if err != nil {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 021c1bb97..2a8b4d76a 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -19,7 +19,7 @@ import (
 func (tp *TestSuite) TestName(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Name() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 2e066ca71..e8ab1a7f4 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -15,7 +15,7 @@ import (
 func (tp *TestSuite) TestObject(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Object() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 476bbea6b..d378d1015 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -18,7 +18,7 @@ import (
 func (tp *TestSuite) TestPin(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.Pin() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index 36353f836..f8339f228 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -12,7 +12,7 @@ import (
 func (tp *TestSuite) TestPubSub(t *testing.T) {
 	tp.hasApi(t, func(api iface.CoreAPI) error {
 		if api.PubSub() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 1ed80e873..4273386aa 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -31,7 +31,7 @@ import (
 func (tp *TestSuite) TestUnixfs(t *testing.T) {
 	tp.hasApi(t, func(api coreiface.CoreAPI) error {
 		if api.Unixfs() == nil {
-			return apiNotImplemented
+			return errAPINotImplemented
 		}
 		return nil
 	})
@@ -1035,8 +1035,7 @@ func (tp *TestSuite) TestGetReadAt(t *testing.T) {
 
 	origR := bytes.NewReader(orig)
 
-	r, err = api.Unixfs().Get(ctx, p)
-	if err != nil {
+	if _, err := api.Unixfs().Get(ctx, p); err != nil {
 		t.Fatal(err)
 	}
 

From 58c9824ce49e83378d63d6c3a1aa9ed2f2417a5b Mon Sep 17 00:00:00 2001
From: Hannah Howard <hannah@hannahhoward.net>
Date: Thu, 12 Aug 2021 09:35:49 -0700
Subject: [PATCH 234/247] IPLD In IPFS: Target Merge Branch (#67)

* update go-path and error message
* add node api for prime interactions
* use go-unixfsnode
* update against fetcher

Co-authored-by: acruikshank <acruikshank@example.com>

This commit was moved from ipfs/interface-go-ipfs-core@49cdff8024e607072e57a7f7556e9875d2aa0412

This commit was moved from ipfs/boxo@8f0db8f18428127afb5e6c114ada8c751d5116de
---
 core/coreiface/coreapi.go    | 1 +
 core/coreiface/tests/path.go | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 12cb166a8..aacda0459 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/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"
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 2d9497244..5a249fabf 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -2,11 +2,14 @@ package tests
 
 import (
 	"context"
-	"github.com/ipfs/interface-go-ipfs-core/path"
+	"errors"
 	"math"
 	"strings"
 	"testing"
 
+	"github.com/ipfs/go-path/resolver"
+	"github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
@@ -138,7 +141,7 @@ func (tp *TestSuite) TestInvalidPathRemainder(t *testing.T) {
 	}
 
 	_, err = api.ResolvePath(ctx, path.New("/ipld/"+nd.Cid().String()+"/bar/baz"))
-	if err == nil || !strings.Contains(err.Error(), "no such link found") {
+	if err == nil || !errors.As(err, &resolver.ErrNoLink{}) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 }

From f909368aa097438d3ae19dc4c8f3b0512b79e540 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 17 Aug 2021 13:10:26 -0700
Subject: [PATCH 235/247] fix: check errors by string

Unfortunately, we return errors over the HTTP API and lose the type.


This commit was moved from ipfs/interface-go-ipfs-core@98e72571bc4514239cbe7bba4321ab5da4194366

This commit was moved from ipfs/boxo@b722930c08cda76a887769564a94055f41268c38
---
 core/coreiface/tests/path.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 5a249fabf..f6d05372e 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -2,12 +2,10 @@ package tests
 
 import (
 	"context"
-	"errors"
 	"math"
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-path/resolver"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
@@ -141,7 +139,7 @@ func (tp *TestSuite) TestInvalidPathRemainder(t *testing.T) {
 	}
 
 	_, err = api.ResolvePath(ctx, path.New("/ipld/"+nd.Cid().String()+"/bar/baz"))
-	if err == nil || !errors.As(err, &resolver.ErrNoLink{}) {
+	if err == nil || !strings.Contains(err.Error(), `no link named "bar"`) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 }

From 49e2b34be58f7132851388652ec1da250bf13c20 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <code@hector.link>
Date: Wed, 2 Mar 2022 16:44:11 +0100
Subject: [PATCH 236/247] Update tests to use ipld.IsNotFound to check for
 notfound errors

This commit was moved from ipfs/interface-go-ipfs-core@01ee9419a28353cab04979f0791133df9869f30a

This commit was moved from ipfs/boxo@2263eca4a44789edb3c0d244c961c12bcb1585ad
---
 core/coreiface/tests/block.go  | 5 +++--
 core/coreiface/tests/unixfs.go | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 7dbfa4df0..8d0243e7e 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"testing"
 
+	ipld "github.com/ipfs/go-ipld-format"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"
@@ -179,7 +180,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected err to exist")
 	}
-	if !strings.Contains(err.Error(), "blockservice: key not found") {
+	if !ipld.IsNotFound(err) {
 		t.Errorf("unexpected error; %s", err.Error())
 	}
 
@@ -187,7 +188,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected err to exist")
 	}
-	if !strings.Contains(err.Error(), "blockstore: block not found") {
+	if !strings.Contains(err.Error(), "not found") {
 		t.Errorf("unexpected error; %s", err.Error())
 	}
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 4273386aa..f47d34d0a 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 	"io/ioutil"
 	"math"
@@ -16,12 +15,15 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/ipfs/interface-go-ipfs-core/path"
+
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-ipfs-files"
 	cbor "github.com/ipfs/go-ipld-cbor"
+	ipld "github.com/ipfs/go-ipld-format"
 	mdag "github.com/ipfs/go-merkledag"
 	"github.com/ipfs/go-unixfs"
 	"github.com/ipfs/go-unixfs/importer/helpers"
@@ -576,7 +578,7 @@ func (tp *TestSuite) TestAddHashOnly(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected an error")
 	}
-	if !strings.Contains(err.Error(), "blockservice: key not found") {
+	if !ipld.IsNotFound(err) {
 		t.Errorf("unxepected error: %s", err.Error())
 	}
 }

From 29d037909ba8e25f5a62b240ac2b09c1d6591b03 Mon Sep 17 00:00:00 2001
From: godcong <jumbycc@163.com>
Date: Fri, 25 Mar 2022 22:32:10 +0800
Subject: [PATCH 237/247] fix: document error (#74)

This commit was moved from ipfs/interface-go-ipfs-core@e9a299166898903a08f98e766aa23f452170496a

This commit was moved from ipfs/boxo@f9d0ad972ce79a1fca890370606d585cf49416fe
---
 core/coreiface/coreapi.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index aacda0459..894ffb318 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -32,7 +32,7 @@ type CoreAPI interface {
 	// Pin returns an implementation of Pin API
 	Pin() PinAPI
 
-	// ObjectAPI returns an implementation of Object API
+	// Object returns an implementation of Object API
 	Object() ObjectAPI
 
 	// Dht returns an implementation of Dht API

From 9120e3f1f96ec178225cabaac3aba45942f93895 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Thu, 31 Mar 2022 23:55:17 +0200
Subject: [PATCH 238/247] fix: use IPLD.ErrNotFound instead of string
 comparison in tests

This commit was moved from ipfs/interface-go-ipfs-core@03f4e9cca18f0882ae13f718d4b3e18ef1f361ca

This commit was moved from ipfs/boxo@548e3d4298370c022c6e79dbe5614d8c80ea90b9
---
 core/coreiface/tests/block.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 8d0243e7e..87fa90b65 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -188,7 +188,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected err to exist")
 	}
-	if !strings.Contains(err.Error(), "not found") {
+	if !ipld.IsNotFound(err) {
 		t.Errorf("unexpected error; %s", err.Error())
 	}
 

From caa42b563414150604234fbe9b7588b240187aaa Mon Sep 17 00:00:00 2001
From: Lucas Molas <schomatis@gmail.com>
Date: Thu, 21 Apr 2022 12:41:58 -0300
Subject: [PATCH 239/247] refactor(block): CIDv1 and BlockPutSettings CidPrefix
 (#80)

* feat(block options): add store codec
* refactor: BlockPutSettings.CidPrefix

Removes duplicated fields and replaces them with cid.Prefix

Codec, MhType and MhLength were  already in prefix, and we already return
prefix. A lot of duplicated values and code responsible for syncing them
did not really need to exist.

* test: CIDv1 raw and dag-pb cases
* chore: release 0.7.0

Co-authored-by: Marcin Rataj <lidel@lidel.org>

This commit was moved from ipfs/interface-go-ipfs-core@a3374d99028d96a1ef262b81acb385690eb36f97

This commit was moved from ipfs/boxo@aca3a1839f42a590b5fa7ce30e743232c9336023
---
 core/coreiface/options/block.go | 134 ++++++++++++++++++++------------
 core/coreiface/tests/block.go   | 103 ++++++++++++++++++++++--
 2 files changed, 181 insertions(+), 56 deletions(-)

diff --git a/core/coreiface/options/block.go b/core/coreiface/options/block.go
index 043dfdea4..130648682 100644
--- a/core/coreiface/options/block.go
+++ b/core/coreiface/options/block.go
@@ -2,15 +2,15 @@ package options
 
 import (
 	"fmt"
+
 	cid "github.com/ipfs/go-cid"
+	mc "github.com/multiformats/go-multicodec"
 	mh "github.com/multiformats/go-multihash"
 )
 
 type BlockPutSettings struct {
-	Codec    string
-	MhType   uint64
-	MhLength int
-	Pin      bool
+	CidPrefix cid.Prefix
+	Pin       bool
 }
 
 type BlockRmSettings struct {
@@ -20,53 +20,29 @@ type BlockRmSettings struct {
 type BlockPutOption func(*BlockPutSettings) error
 type BlockRmOption func(*BlockRmSettings) error
 
-func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, cid.Prefix, error) {
+func BlockPutOptions(opts ...BlockPutOption) (*BlockPutSettings, error) {
+	var cidPrefix cid.Prefix
+
+	// Baseline is CIDv1 raw sha2-255-32 (can be tweaked later via opts)
+	cidPrefix.Version = 1
+	cidPrefix.Codec = uint64(mc.Raw)
+	cidPrefix.MhType = mh.SHA2_256
+	cidPrefix.MhLength = -1 // -1 means len is to be calculated during mh.Sum()
+
 	options := &BlockPutSettings{
-		Codec:    "",
-		MhType:   mh.SHA2_256,
-		MhLength: -1,
-		Pin:      false,
+		CidPrefix: cidPrefix,
+		Pin:       false,
 	}
 
+	// Apply any overrides
 	for _, opt := range opts {
 		err := opt(options)
 		if err != nil {
-			return nil, cid.Prefix{}, err
+			return nil, err
 		}
 	}
 
-	var pref cid.Prefix
-	pref.Version = 1
-
-	if options.Codec == "" {
-		if options.MhType != mh.SHA2_256 || (options.MhLength != -1 && options.MhLength != 32) {
-			options.Codec = "protobuf"
-		} else {
-			options.Codec = "v0"
-		}
-	}
-
-	if options.Codec == "v0" && options.MhType == mh.SHA2_256 {
-		pref.Version = 0
-	}
-
-	formatval, ok := cid.Codecs[options.Codec]
-	if !ok {
-		return nil, cid.Prefix{}, fmt.Errorf("unrecognized format: %s", options.Codec)
-	}
-
-	if options.Codec == "v0" {
-		if options.MhType != mh.SHA2_256 || (options.MhLength != -1 && options.MhLength != 32) {
-			return nil, cid.Prefix{}, fmt.Errorf("only sha2-255-32 is allowed with CIDv0")
-		}
-	}
-
-	pref.Codec = formatval
-
-	pref.MhType = options.MhType
-	pref.MhLength = options.MhLength
-
-	return options, pref, nil
+	return options, nil
 }
 
 func BlockRmOptions(opts ...BlockRmOption) (*BlockRmSettings, error) {
@@ -87,22 +63,84 @@ type blockOpts struct{}
 
 var Block blockOpts
 
-// Format is an option for Block.Put which specifies the multicodec to use to
-// serialize the object. Default is "v0"
-func (blockOpts) Format(codec string) BlockPutOption {
+// CidCodec is the modern option for Block.Put which specifies the multicodec to use
+// in the CID returned by the Block.Put operation.
+// It uses correct codes from go-multicodec and replaces the old Format now with CIDv1 as the default.
+func (blockOpts) CidCodec(codecName string) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
-		settings.Codec = codec
+		if codecName == "" {
+			return nil
+		}
+		code, err := codeFromName(codecName)
+		if err != nil {
+			return err
+		}
+		settings.CidPrefix.Codec = uint64(code)
 		return nil
 	}
 }
 
+// Map string to code from go-multicodec
+func codeFromName(codecName string) (mc.Code, error) {
+	var cidCodec mc.Code
+	err := cidCodec.Set(codecName)
+	return cidCodec, err
+}
+
+// Format is a legacy option for Block.Put which specifies the multicodec to
+// use to serialize the object.
+// Provided for backward-compatibility only. Use CidCodec instead.
+func (blockOpts) Format(format string) BlockPutOption {
+	return func(settings *BlockPutSettings) error {
+		if format == "" {
+			return nil
+		}
+		// Opt-in CIDv0 support for backward-compatibility
+		if format == "v0" {
+			settings.CidPrefix.Version = 0
+		}
+
+		// Fixup a legacy (invalid) names for dag-pb (0x70)
+		if format == "v0" || format == "protobuf" {
+			format = "dag-pb"
+		}
+
+		// Fixup invalid name for dag-cbor (0x71)
+		if format == "cbor" {
+			format = "dag-cbor"
+		}
+
+		// Set code based on name passed as "format"
+		code, err := codeFromName(format)
+		if err != nil {
+			return err
+		}
+		settings.CidPrefix.Codec = uint64(code)
+
+		// If CIDv0, ensure all parameters are compatible
+		// (in theory go-cid would validate this anyway, but we want to provide better errors)
+		pref := settings.CidPrefix
+		if pref.Version == 0 {
+			if pref.Codec != uint64(mc.DagPb) {
+				return fmt.Errorf("only dag-pb is allowed with CIDv0")
+			}
+			if pref.MhType != mh.SHA2_256 || (pref.MhLength != -1 && pref.MhLength != 32) {
+				return fmt.Errorf("only sha2-255-32 is allowed with CIDv0")
+			}
+		}
+
+		return nil
+	}
+
+}
+
 // Hash is an option for Block.Put which specifies the multihash settings to use
 // when hashing the object. Default is mh.SHA2_256 (0x12).
 // If mhLen is set to -1, default length for the hash will be used
 func (blockOpts) Hash(mhType uint64, mhLen int) BlockPutOption {
 	return func(settings *BlockPutSettings) error {
-		settings.MhType = mhType
-		settings.MhLength = mhLen
+		settings.CidPrefix.MhType = mhType
+		settings.CidPrefix.MhLength = mhLen
 		return nil
 	}
 }
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 87fa90b65..916e52dd3 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -17,15 +17,19 @@ import (
 )
 
 var (
-	pbCid    = "QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN"
-	cborCid  = "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm"
-	cborKCid = "bafyr2qgsohbwdlk7ajmmbb4lhoytmest4wdbe5xnexfvtxeatuyqqmwv3fgxp3pmhpc27gwey2cct56gloqefoqwcf3yqiqzsaqb7p4jefhcw"
+	pbCidV0  = "QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN"                                                                 // dag-pb
+	pbCid    = "bafybeiffndsajwhk3lwjewwdxqntmjm4b5wxaaanokonsggenkbw6slwk4"                                                    // dag-pb
+	rawCid   = "bafkreiffndsajwhk3lwjewwdxqntmjm4b5wxaaanokonsggenkbw6slwk4"                                                    // raw bytes
+	cborCid  = "bafyreicnga62zhxnmnlt6ymq5hcbsg7gdhqdu6z4ehu3wpjhvqnflfy6nm"                                                    // dag-cbor
+	cborKCid = "bafyr2qgsohbwdlk7ajmmbb4lhoytmest4wdbe5xnexfvtxeatuyqqmwv3fgxp3pmhpc27gwey2cct56gloqefoqwcf3yqiqzsaqb7p4jefhcw" // dag-cbor keccak-512
 )
 
+// dag-pb
 func pbBlock() io.Reader {
 	return bytes.NewReader([]byte{10, 12, 8, 2, 18, 6, 104, 101, 108, 108, 111, 10, 24, 6})
 }
 
+// dag-cbor
 func cborBlock() io.Reader {
 	return bytes.NewReader([]byte{101, 72, 101, 108, 108, 111})
 }
@@ -38,8 +42,12 @@ func (tp *TestSuite) TestBlock(t *testing.T) {
 		return nil
 	})
 
-	t.Run("TestBlockPut", tp.TestBlockPut)
-	t.Run("TestBlockPutFormat", tp.TestBlockPutFormat)
+	t.Run("TestBlockPut (get raw CIDv1)", tp.TestBlockPut)
+	t.Run("TestBlockPutCidCodec: dag-pb", tp.TestBlockPutCidCodecDagPb)
+	t.Run("TestBlockPutCidCodec: dag-cbor", tp.TestBlockPutCidCodecDagCbor)
+	t.Run("TestBlockPutFormat (legacy): cbor → dag-cbor", tp.TestBlockPutFormatDagCbor)
+	t.Run("TestBlockPutFormat (legacy): protobuf → dag-pb", tp.TestBlockPutFormatDagPb)
+	t.Run("TestBlockPutFormat (legacy): v0 → CIDv0", tp.TestBlockPutFormatV0)
 	t.Run("TestBlockPutHash", tp.TestBlockPutHash)
 	t.Run("TestBlockGet", tp.TestBlockGet)
 	t.Run("TestBlockRm", tp.TestBlockRm)
@@ -47,6 +55,7 @@ func (tp *TestSuite) TestBlock(t *testing.T) {
 	t.Run("TestBlockPin", tp.TestBlockPin)
 }
 
+// when no opts are passed, produced CID has 'raw' codec
 func (tp *TestSuite) TestBlockPut(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -60,12 +69,14 @@ func (tp *TestSuite) TestBlockPut(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if res.Path().Cid().String() != pbCid {
+	if res.Path().Cid().String() != rawCid {
 		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
 	}
 }
 
-func (tp *TestSuite) TestBlockPutFormat(t *testing.T) {
+// Format is deprecated, it used invalid codec names.
+// Confirm 'cbor' gets fixed to 'dag-cbor'
+func (tp *TestSuite) TestBlockPutFormatDagCbor(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	api, err := tp.makeAPI(ctx)
@@ -83,6 +94,82 @@ func (tp *TestSuite) TestBlockPutFormat(t *testing.T) {
 	}
 }
 
+// Format is deprecated, it used invalid codec names.
+// Confirm 'protobuf' got fixed to 'dag-pb'
+func (tp *TestSuite) TestBlockPutFormatDagPb(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res, err := api.Block().Put(ctx, pbBlock(), opt.Block.Format("protobuf"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Path().Cid().String() != pbCid {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+// Format is deprecated, it used invalid codec names.
+// Confirm fake codec 'v0' got fixed to CIDv0 (with implicit dag-pb codec)
+func (tp *TestSuite) TestBlockPutFormatV0(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res, err := api.Block().Put(ctx, pbBlock(), opt.Block.Format("v0"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Path().Cid().String() != pbCidV0 {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+func (tp *TestSuite) TestBlockPutCidCodecDagCbor(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res, err := api.Block().Put(ctx, cborBlock(), opt.Block.CidCodec("dag-cbor"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Path().Cid().String() != cborCid {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
+func (tp *TestSuite) TestBlockPutCidCodecDagPb(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	api, err := tp.makeAPI(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res, err := api.Block().Put(ctx, pbBlock(), opt.Block.CidCodec("dag-pb"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if res.Path().Cid().String() != pbCid {
+		t.Errorf("got wrong cid: %s", res.Path().Cid().String())
+	}
+}
+
 func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -95,7 +182,7 @@ func (tp *TestSuite) TestBlockPutHash(t *testing.T) {
 		ctx,
 		cborBlock(),
 		opt.Block.Hash(mh.KECCAK_512, -1),
-		opt.Block.Format("cbor"),
+		opt.Block.CidCodec("dag-cbor"),
 	)
 	if err != nil {
 		t.Fatal(err)

From f2614d979edfef6bb4ee6c3465aa3636c9f95850 Mon Sep 17 00:00:00 2001
From: web3-bot <81333946+web3-bot@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:07:58 +0200
Subject: [PATCH 240/247] sync: update CI config files (#87)

This commit was moved from ipfs/interface-go-ipfs-core@de3410bbe2bbdbf50e090a06eda0f741cad5381c

This commit was moved from ipfs/boxo@ea6ac8cb6aa02f6cd88cb141f3f077e206277829
---
 core/coreiface/block.go        |  3 ++-
 core/coreiface/dht.go          |  1 +
 core/coreiface/key.go          |  1 +
 core/coreiface/name.go         |  1 +
 core/coreiface/object.go       |  3 ++-
 core/coreiface/options/key.go  |  2 +-
 core/coreiface/options/name.go |  1 -
 core/coreiface/options/pin.go  | 40 +++++++++++++++++-----------------
 core/coreiface/path/path.go    |  2 +-
 core/coreiface/pin.go          |  1 +
 core/coreiface/tests/block.go  |  5 ++---
 core/coreiface/tests/dag.go    |  3 ++-
 core/coreiface/tests/object.go | 10 ++++-----
 core/coreiface/tests/pin.go    |  2 +-
 core/coreiface/tests/pubsub.go |  2 +-
 core/coreiface/tests/unixfs.go |  9 ++++----
 core/coreiface/unixfs.go       |  3 ++-
 17 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index b105b079d..49ffe75d7 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 5f49e74a3..81a20ee2b 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index db729b3b4..967255665 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index 3dc9f6878..d2725e028 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -3,6 +3,7 @@ package iface
 import (
 	"context"
 	"errors"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 86536d421..733dc2bee 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -2,9 +2,10 @@ package iface
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"io"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/ipfs/go-cid"
diff --git a/core/coreiface/options/key.go b/core/coreiface/options/key.go
index 80beea352..4bc53a65f 100644
--- a/core/coreiface/options/key.go
+++ b/core/coreiface/options/key.go
@@ -69,7 +69,7 @@ func (keyOpts) Type(algorithm string) KeyGenerateOption {
 // generated. Default is -1
 //
 // value of -1 means 'use default size for key type':
-//  * 2048 for RSA
+//   - 2048 for RSA
 func (keyOpts) Size(size int) KeyGenerateOption {
 	return func(settings *KeyGenerateSettings) error {
 		settings.Size = size
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index 59aaf2ca3..aa8082863 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -113,7 +113,6 @@ func (nameOpts) Cache(cache bool) NameResolveOption {
 	}
 }
 
-//
 func (nameOpts) ResolveOption(opt ropts.ResolveOpt) NameResolveOption {
 	return func(settings *NameResolveSettings) error {
 		settings.ResolveOpts = append(settings.ResolveOpts, opt)
diff --git a/core/coreiface/options/pin.go b/core/coreiface/options/pin.go
index 5014a2d2b..75c2b8a26 100644
--- a/core/coreiface/options/pin.go
+++ b/core/coreiface/options/pin.go
@@ -164,11 +164,11 @@ func (pinLsOpts) Indirect() PinLsOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -182,11 +182,11 @@ func (pinLsOpts) Type(typeStr string) (PinLsOption, error) {
 // be returned
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinLsOpts) pinType(t string) PinLsOption {
 	return func(settings *PinLsSettings) error {
 		settings.Type = t
@@ -224,11 +224,11 @@ func (pinIsPinnedOpts) Indirect() PinIsPinnedOption {
 // type.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 	switch typeStr {
 	case "all", "direct", "indirect", "recursive":
@@ -242,11 +242,11 @@ func (pinIsPinnedOpts) Type(typeStr string) (PinIsPinnedOption, error) {
 // pin is expected to be, speeding up the research.
 //
 // Supported values:
-// * "direct" - directly pinned objects
-// * "recursive" - roots of recursive pins
-// * "indirect" - indirectly pinned objects (referenced by recursively pinned
-//    objects)
-// * "all" - all pinned objects (default)
+//   - "direct" - directly pinned objects
+//   - "recursive" - roots of recursive pins
+//   - "indirect" - indirectly pinned objects (referenced by recursively pinned
+//     objects)
+//   - "all" - all pinned objects (default)
 func (pinIsPinnedOpts) pinType(t string) PinIsPinnedOption {
 	return func(settings *PinIsPinnedSettings) error {
 		settings.WithType = t
diff --git a/core/coreiface/path/path.go b/core/coreiface/path/path.go
index 01b1673b1..e2562936d 100644
--- a/core/coreiface/path/path.go
+++ b/core/coreiface/path/path.go
@@ -15,7 +15,7 @@ import (
 // * /ipfs - Immutable unixfs path (files)
 // * /ipld - Immutable ipld path (data)
 // * /ipns - Mutable names. Usually resolves to one of the immutable paths
-//TODO: /local (MFS)
+// TODO: /local (MFS)
 type Path interface {
 	// String returns the path as a string.
 	String() string
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 4c1788c68..6205a9b20 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -2,6 +2,7 @@ package iface
 
 import (
 	"context"
+
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index 916e52dd3..a81969916 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"strings"
 	"testing"
 
@@ -211,7 +210,7 @@ func (tp *TestSuite) TestBlockGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -249,7 +248,7 @@ func (tp *TestSuite) TestBlockRm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	d, err := ioutil.ReadAll(r)
+	d, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index 6f9d9659e..5ea0d3eb1 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -2,12 +2,13 @@ package tests
 
 import (
 	"context"
-	path "github.com/ipfs/interface-go-ipfs-core/path"
 	"math"
 	gopath "path"
 	"strings"
 	"testing"
 
+	path "github.com/ipfs/interface-go-ipfs-core/path"
+
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
 	ipldcbor "github.com/ipfs/go-ipld-cbor"
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index e8ab1a7f4..c3437853c 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
@@ -143,7 +143,7 @@ func (tp *TestSuite) TestObjectData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -383,7 +383,7 @@ func (tp *TestSuite) TestObjectAddData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -416,7 +416,7 @@ func (tp *TestSuite) TestObjectSetData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index d378d1015..ad1a0fdd2 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index f8339f228..18da2103d 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index f47d34d0a..05226dbbf 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"os"
@@ -113,7 +112,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 		return path.IpfsPath(c)
 	}
 
-	rf, err := ioutil.TempFile(os.TempDir(), "unixfs-add-real")
+	rf, err := os.CreateTemp(os.TempDir(), "unixfs-add-real")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -134,7 +133,7 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 	defer os.Remove(rfp)
 
 	realFile := func() files.Node {
-		n, err := files.NewReaderPathFile(rfp, ioutil.NopCloser(strings.NewReader(helloStr)), stat)
+		n, err := files.NewReaderPathFile(rfp, io.NopCloser(strings.NewReader(helloStr)), stat)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -474,12 +473,12 @@ func (tp *TestSuite) TestAdd(t *testing.T) {
 					defer orig.Close()
 					defer got.Close()
 
-					do, err := ioutil.ReadAll(orig.(files.File))
+					do, err := io.ReadAll(orig.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}
 
-					dg, err := ioutil.ReadAll(got.(files.File))
+					dg, err := io.ReadAll(got.(files.File))
 					if err != nil {
 						t.Fatal(err)
 					}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 686c40298..c398b6722 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,11 +2,12 @@ package iface
 
 import (
 	"context"
+
 	"github.com/ipfs/interface-go-ipfs-core/options"
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-files"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 type AddEvent struct {

From 46577b15b76c8c9666f4112d034463076cd2604e Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 21 Nov 2022 09:38:01 +1300
Subject: [PATCH 241/247] chore: update go-libp2p to v0.23.4

This commit was moved from ipfs/interface-go-ipfs-core@96e9f233339ef16c3f1be4db6ced89ff82accfbb

This commit was moved from ipfs/boxo@90ca296f80108f2fd10943895a8df31e28967850
---
 core/coreiface/dht.go    | 4 ++--
 core/coreiface/idfmt.go  | 2 +-
 core/coreiface/key.go    | 4 ++--
 core/coreiface/pubsub.go | 4 ++--
 core/coreiface/swarm.go  | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 81a20ee2b..73bf48305 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -3,11 +3,11 @@ package iface
 import (
 	"context"
 
-	path "github.com/ipfs/interface-go-ipfs-core/path"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/idfmt.go b/core/coreiface/idfmt.go
index 1ba79e602..80fd0f822 100644
--- a/core/coreiface/idfmt.go
+++ b/core/coreiface/idfmt.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	mbase "github.com/multiformats/go-multibase"
 )
 
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 967255665..b0e739cb8 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -3,11 +3,11 @@ package iface
 import (
 	"context"
 
-	path "github.com/ipfs/interface-go-ipfs-core/path"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // Key specifies the interface to Keys in KeyAPI Keystore
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index d9826551d..427256251 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/interface-go-ipfs-core/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index d7b25d5e8..9aa5466ba 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
 
 	ma "github.com/multiformats/go-multiaddr"
 )

From d2edb2ea7859d83a501c455ae054350c3622b83b Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Mon, 12 Dec 2022 21:09:45 +0100
Subject: [PATCH 242/247] feat: add UseCumulativeSize UnixfsLs option (#95)

This commit was moved from ipfs/interface-go-ipfs-core@b1299abda0c69529c7efa02d5efb9f8905fdd4fe

This commit was moved from ipfs/boxo@ff2eb2bff265f34012cca335447987da546ecee2
---
 core/coreiface/options/unixfs.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 3fd96f772..cd15991e2 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -39,7 +39,8 @@ type UnixfsAddSettings struct {
 }
 
 type UnixfsLsSettings struct {
-	ResolveChildren bool
+	ResolveChildren   bool
+	UseCumulativeSize bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -283,3 +284,10 @@ func (unixfsOpts) ResolveChildren(resolve bool) UnixfsLsOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) UseCumulativeSize(use bool) UnixfsLsOption {
+	return func(settings *UnixfsLsSettings) error {
+		settings.UseCumulativeSize = use
+		return nil
+	}
+}

From 587075204dfbd96441b4d787646b87a878ad30c9 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Thu, 12 Jan 2023 11:45:13 +0100
Subject: [PATCH 243/247] chore: migrate files (#97)

This commit was moved from ipfs/interface-go-ipfs-core@f7b346b76c5724489877c511754f0f11923d3214

This commit was moved from ipfs/boxo@01de18ff3f4ccd639e02226048fda8a8f140941c
---
 core/coreiface/tests/name.go   | 2 +-
 core/coreiface/tests/unixfs.go | 2 +-
 core/coreiface/unixfs.go       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 2a8b4d76a..2e648baba 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -10,7 +10,7 @@ import (
 
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
-	files "github.com/ipfs/go-ipfs-files"
+	"github.com/ipfs/go-libipfs/files"
 
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	opt "github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index 05226dbbf..121d3db69 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -20,9 +20,9 @@ import (
 	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"github.com/ipfs/go-cid"
-	files "github.com/ipfs/go-ipfs-files"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
+	"github.com/ipfs/go-libipfs/files"
 	mdag "github.com/ipfs/go-merkledag"
 	"github.com/ipfs/go-unixfs"
 	"github.com/ipfs/go-unixfs/importer/helpers"
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index c398b6722..3b21a8e23 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -7,7 +7,7 @@ import (
 	path "github.com/ipfs/interface-go-ipfs-core/path"
 
 	"github.com/ipfs/go-cid"
-	files "github.com/ipfs/go-ipfs-files"
+	"github.com/ipfs/go-libipfs/files"
 )
 
 type AddEvent struct {

From b3cc938630bc7607f86afed9ba4c1cdfda07e828 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 24 Jan 2023 23:44:55 +0100
Subject: [PATCH 244/247] feat: add namesys publish options (#94)

* feat: add namesys publish options
* feat: export DefaultIPNSRecordEOL
* feat: export DefaultIPNSRecordTTL

This commit was moved from ipfs/interface-go-ipfs-core@468dea4bb45aec6ddce2a6225334dcc062d6e752

This commit was moved from ipfs/boxo@bcb9190c2bdbc0ad4823a1b1785fb87ec8014723
---
 core/coreiface/options/namesys/opts.go | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/core/coreiface/options/namesys/opts.go b/core/coreiface/options/namesys/opts.go
index ee2bd5ac2..0cd1ba778 100644
--- a/core/coreiface/options/namesys/opts.go
+++ b/core/coreiface/options/namesys/opts.go
@@ -13,6 +13,15 @@ const (
 	// trust resolution to eventually complete and can't put an upper
 	// limit on how many steps it will take.
 	UnlimitedDepth = 0
+
+	// DefaultIPNSRecordTTL specifies the time that the record can be cached
+	// before checking if its validity again.
+	DefaultIPNSRecordTTL = time.Minute
+
+	// DefaultIPNSRecordEOL specifies the time that the network will cache IPNS
+	// records after being published. Records should be re-published before this
+	// interval expires. We use the same default expiration as the DHT.
+	DefaultIPNSRecordEOL = 48 * time.Hour
 )
 
 // ResolveOpts specifies options for resolving an IPNS path
@@ -72,3 +81,43 @@ func ProcessOpts(opts []ResolveOpt) ResolveOpts {
 	}
 	return rsopts
 }
+
+// PublishOptions specifies options for publishing an IPNS record.
+type PublishOptions struct {
+	EOL time.Time
+	TTL time.Duration
+}
+
+// DefaultPublishOptions returns the default options for publishing an IPNS record.
+func DefaultPublishOptions() PublishOptions {
+	return PublishOptions{
+		EOL: time.Now().Add(DefaultIPNSRecordEOL),
+		TTL: DefaultIPNSRecordTTL,
+	}
+}
+
+// PublishOption is used to set an option for PublishOpts.
+type PublishOption func(*PublishOptions)
+
+// PublishWithEOL sets an EOL.
+func PublishWithEOL(eol time.Time) PublishOption {
+	return func(o *PublishOptions) {
+		o.EOL = eol
+	}
+}
+
+// PublishWithEOL sets a TTL.
+func PublishWithTTL(ttl time.Duration) PublishOption {
+	return func(o *PublishOptions) {
+		o.TTL = ttl
+	}
+}
+
+// ProcessPublishOptions converts an array of PublishOpt into a PublishOpts object.
+func ProcessPublishOptions(opts []PublishOption) PublishOptions {
+	rsopts := DefaultPublishOptions()
+	for _, option := range opts {
+		option(&rsopts)
+	}
+	return rsopts
+}

From 132206b573c44164a6571a551cf1b2c3acbcb438 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Mon, 14 Nov 2022 17:18:43 +0100
Subject: [PATCH 245/247] feat: add RoutingAPI to CoreAPI

This commit was moved from ipfs/interface-go-ipfs-core@177d25ba92ed67ab4916cb13827321c389961de0

This commit was moved from ipfs/boxo@b3ab88834562c689b5eadfed2e08e732fea4392a
---
 core/coreiface/coreapi.go |  3 +++
 core/coreiface/routing.go | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 core/coreiface/routing.go

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 894ffb318..722c00a0f 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -44,6 +44,9 @@ type CoreAPI interface {
 	// PubSub returns an implementation of PubSub API
 	PubSub() PubSubAPI
 
+	// Routing returns an implementation of Routing API
+	Routing() RoutingAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, path.Path) (path.Resolved, error)
 
diff --git a/core/coreiface/routing.go b/core/coreiface/routing.go
new file mode 100644
index 000000000..a28ceb9e7
--- /dev/null
+++ b/core/coreiface/routing.go
@@ -0,0 +1,14 @@
+package iface
+
+import (
+	"context"
+)
+
+// RoutingAPI specifies the interface to the routing layer.
+type RoutingAPI interface {
+	// Get retrieves the best value for a given key
+	Get(context.Context, string) ([]byte, error)
+
+	// Put sets a value for a given key
+	Put(ctx context.Context, key string, value []byte) error
+}

From 3f7c35bdb9239717c6e7f807e4effb6302842562 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 8 Feb 2023 08:37:20 +0100
Subject: [PATCH 246/247] test: basic routing interface test

This commit was moved from ipfs/interface-go-ipfs-core@d069f41be1eea938a4bbaa16dae953eed24bc945

This commit was moved from ipfs/boxo@48f8c69a903b1e66f8725f6b5ce9741b8e88c5a1
---
 core/coreiface/tests/api.go     |  1 +
 core/coreiface/tests/routing.go | 92 +++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 core/coreiface/tests/routing.go

diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 0801b3ca7..ec1f63ae6 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -69,6 +69,7 @@ func TestApi(p Provider) func(t *testing.T) {
 		t.Run("Path", tp.TestPath)
 		t.Run("Pin", tp.TestPin)
 		t.Run("PubSub", tp.TestPubSub)
+		t.Run("Routing", tp.TestRouting)
 		t.Run("Unixfs", tp.TestUnixfs)
 
 		apis <- -1
diff --git a/core/coreiface/tests/routing.go b/core/coreiface/tests/routing.go
new file mode 100644
index 000000000..14e0d2e66
--- /dev/null
+++ b/core/coreiface/tests/routing.go
@@ -0,0 +1,92 @@
+package tests
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/gogo/protobuf/proto"
+	ipns_pb "github.com/ipfs/go-ipns/pb"
+	iface "github.com/ipfs/interface-go-ipfs-core"
+)
+
+func (tp *TestSuite) TestRouting(t *testing.T) {
+	tp.hasApi(t, func(api iface.CoreAPI) error {
+		if api.Routing() == nil {
+			return errAPINotImplemented
+		}
+		return nil
+	})
+
+	t.Run("TestRoutingGet", tp.TestRoutingGet)
+	t.Run("TestRoutingPut", tp.TestRoutingPut)
+}
+
+func (tp *TestSuite) testRoutingPublishKey(t *testing.T, ctx context.Context, api iface.CoreAPI) iface.IpnsEntry {
+	p, err := addTestObject(ctx, api)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	entry, err := api.Name().Publish(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	time.Sleep(3 * time.Second)
+	return entry
+}
+
+func (tp *TestSuite) TestRoutingGet(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	apis, err := tp.MakeAPISwarm(ctx, true, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Node 1: publishes an IPNS name
+	ipnsEntry := tp.testRoutingPublishKey(t, ctx, apis[0])
+
+	// Node 2: retrieves the best value for the IPNS name.
+	data, err := apis[1].Routing().Get(ctx, "/ipns/"+ipnsEntry.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Checks if values match.
+	var entry ipns_pb.IpnsEntry
+	err = proto.Unmarshal(data, &entry)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(entry.GetValue()) != ipnsEntry.Value().String() {
+		t.Fatalf("routing key has wrong value, expected %s, got %s", ipnsEntry.Value().String(), string(entry.GetValue()))
+	}
+}
+
+func (tp *TestSuite) TestRoutingPut(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	apis, err := tp.MakeAPISwarm(ctx, true, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create and publish IPNS entry.
+	ipnsEntry := tp.testRoutingPublishKey(t, ctx, apis[0])
+
+	// Get valid routing value.
+	data, err := apis[0].Routing().Get(ctx, "/ipns/"+ipnsEntry.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Put routing value.
+	err = apis[0].Routing().Put(ctx, "/ipns/"+ipnsEntry.Name(), data)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

From 3b6647ffdc86bfe219a52ccb9b48d4f4608d5bb7 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Fri, 10 Feb 2023 03:25:12 +0100
Subject: [PATCH 247/247] test: use two nodes in publish

This spin up online nodes instead of offline ones.


This commit was moved from ipfs/interface-go-ipfs-core@a8d2741bbe08a6ba54cf4a4e229eff6978be1b77

This commit was moved from ipfs/boxo@54d20f01739e73f7c770db8f2dc0be1c2185ce20
---
 core/coreiface/tests/routing.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/tests/routing.go b/core/coreiface/tests/routing.go
index 14e0d2e66..64287487e 100644
--- a/core/coreiface/tests/routing.go
+++ b/core/coreiface/tests/routing.go
@@ -70,7 +70,7 @@ func (tp *TestSuite) TestRoutingGet(t *testing.T) {
 func (tp *TestSuite) TestRoutingPut(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	apis, err := tp.MakeAPISwarm(ctx, true, 1)
+	apis, err := tp.MakeAPISwarm(ctx, true, 2)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +85,7 @@ func (tp *TestSuite) TestRoutingPut(t *testing.T) {
 	}
 
 	// Put routing value.
-	err = apis[0].Routing().Put(ctx, "/ipns/"+ipnsEntry.Name(), data)
+	err = apis[1].Routing().Put(ctx, "/ipns/"+ipnsEntry.Name(), data)
 	if err != nil {
 		t.Fatal(err)
 	}