Improve ErrNotFound

Work with ipld.ErrNotFounds.
ipfs · Apr 7, 2020 · 7f5d9e6 · 7f5d9e6
1 parent d532cda
commit 7f5d9e6
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 72 deletions.
diff --git a/dagutils/diffenum_test.go b/dagutils/diffenum_test.go
@@ -211,7 +211,7 @@ func TestDiffEnumFail(t *testing.T) {
 	}
 
 	err := DiffEnumerate(ctx, lgds, nds["a1"].Cid(), nds["a2"].Cid())
-	if err != ipld.ErrNotFound {
+	if !ipld.IsNotFound(err) {
 		t.Fatal("expected err not found")
 	}
 

diff --git a/dagutils/utils.go b/dagutils/utils.go
@@ -107,7 +107,7 @@ func (e *Editor) insertNodeAtPath(ctx context.Context, root *dag.ProtoNode, path
 		if err == dag.ErrLinkNotFound && create != nil {
 			nd = create()
 			err = nil // no longer an error case
-		} else if err == ipld.ErrNotFound {
+		} else if ipld.IsNotFound(err) {
 			// try finding it in our source dagstore
 			nd, err = root.GetLinkedProtoNode(ctx, e.src, path[0])
 		}
@@ -170,7 +170,7 @@ func (e *Editor) rmLink(ctx context.Context, root *dag.ProtoNode, path []string)
 
 	// search for node in both tmp dagstore and source dagstore
 	nd, err := root.GetLinkedProtoNode(ctx, e.tmp, path[0])
-	if err == ipld.ErrNotFound {
+	if ipld.IsNotFound(err) {
 		nd, err = root.GetLinkedProtoNode(ctx, e.src, path[0])
 	}
 
@@ -217,7 +217,7 @@ func copyDag(ctx context.Context, nd ipld.Node, from, to ipld.DAGService) error
 	for _, lnk := range nd.Links() {
 		child, err := lnk.GetNode(ctx, from)
 		if err != nil {
-			if err == ipld.ErrNotFound {
+			if ipld.IsNotFound(err) {
 				// not found means we didnt modify it, and it should
 				// already be in the target datastore
 				continue

diff --git a/go.mod b/go.mod
@@ -3,15 +3,15 @@ module github.com/ipfs/go-merkledag
 require (
 	github.com/gogo/protobuf v1.3.1
 	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-blockservice v0.1.0
-	github.com/ipfs/go-cid v0.0.3
-	github.com/ipfs/go-datastore v0.3.1
-	github.com/ipfs/go-ipfs-blockstore v0.1.0
-	github.com/ipfs/go-ipfs-exchange-offline v0.0.1
+	github.com/ipfs/go-blockservice v0.1.4-0.20200407214602-071562482bcf
+	github.com/ipfs/go-cid v0.0.5
+	github.com/ipfs/go-datastore v0.4.4
+	github.com/ipfs/go-ipfs-blockstore v1.0.1-0.20200407212108-882f63676be9
+	github.com/ipfs/go-ipfs-exchange-offline v0.0.2-0.20200407220152-ef546a7fe3f1
 	github.com/ipfs/go-ipfs-util v0.0.1
 	github.com/ipfs/go-ipld-cbor v0.0.3
-	github.com/ipfs/go-ipld-format v0.0.2
-	github.com/multiformats/go-multihash v0.0.10
+	github.com/ipfs/go-ipld-format v0.1.0
+	github.com/multiformats/go-multihash v0.0.13
 )
 
 go 1.12