Skip to content

Commit 7542349

Browse files
authored
Merge pull request ipfs/go-path#30 from ipfs/fix/resolve-no-extra-lookups
ResolveToLastNode no longer fetches nodes it does not need This commit was moved from ipfs/go-path@1533d95
2 parents bcdda94 + 35e8ffb commit 7542349

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

path/resolver/resolver.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ func (r *Resolver) ResolveToLastNode(ctx context.Context, fpath path.Path) (cid.
8989
return cid.Cid{}, nil, err
9090
}
9191

92+
if len(rest) == 0 {
93+
return lnk.Cid, nil, nil
94+
}
95+
9296
next, err := lnk.GetNode(ctx, r.DAG)
9397
if err != nil {
9498
return cid.Cid{}, nil, err

path/resolver/resolver_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,43 @@ func TestRecurivePathResolution(t *testing.T) {
105105
p.String(), rCid.String(), cKey.String()))
106106
}
107107
}
108+
109+
func TestResolveToLastNode_NoUnnecessaryFetching(t *testing.T) {
110+
ctx := context.Background()
111+
dagService := dagmock.Mock()
112+
113+
a := randNode()
114+
b := randNode()
115+
116+
err := a.AddNodeLink("child", b)
117+
if err != nil {
118+
t.Fatal(err)
119+
}
120+
121+
err = dagService.Add(ctx, a)
122+
if err != nil {
123+
t.Fatal(err)
124+
}
125+
126+
aKey := a.Cid()
127+
128+
segments := []string{aKey.String(), "child"}
129+
p, err := path.FromSegments("/ipfs/", segments...)
130+
if err != nil {
131+
t.Fatal(err)
132+
}
133+
134+
resolver := resolver.NewBasicResolver(dagService)
135+
resolvedCID, remainingPath, err := resolver.ResolveToLastNode(ctx, p)
136+
if err != nil {
137+
t.Fatal(err)
138+
}
139+
140+
if len(remainingPath) > 0 {
141+
t.Fatal("cannot have remaining path")
142+
}
143+
144+
if !resolvedCID.Equals(b.Cid()) {
145+
t.Fatal("resolved to the wrong CID")
146+
}
147+
}

0 commit comments

Comments
 (0)