Merge pull request #30 from ipfs/fix/resolve-no-extra-lookups

ResolveToLastNode no longer fetches nodes it does not need

Author: aschmahmann

resolver/resolver.go

@@ -89,6 +89,10 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (cid.
 			return cid.Cid{}, nil, err
 		}
 
+		if len(rest) == 0 {
+			return lnk.Cid, nil, nil
+		}
+
 		next, err := lnk.GetNode(ctx, r.DAG)
 		if err != nil {
 			return cid.Cid{}, nil, err

resolver/resolver_test.go

@@ -105,3 +105,43 @@ func TestRecurivePathResolution(t *testing.T) {
 			p.String(), rCid.String(), cKey.String()))
 	}
 }
+
+func TestResolveToLastNode_NoUnnecessaryFetching(t *testing.T) {
+	ctx := context.Background()
+	dagService := dagmock.Mock()
+
+	a := randNode()
+	b := randNode()
+
+	err := a.AddNodeLink("child", b)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = dagService.Add(ctx, a)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	aKey := a.Cid()
+
+	segments := []string{aKey.String(), "child"}
+	p, err := path.FromSegments("/ipfs/", segments...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resolver := resolver.NewBasicResolver(dagService)
+	resolvedCID, remainingPath, err := resolver.ResolveToLastNode(ctx, p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(remainingPath) > 0 {
+		t.Fatal("cannot have remaining path")
+	}
+
+	if !resolvedCID.Equals(b.Cid()) {
+		t.Fatal("resolved to the wrong CID")
+	}
+}