1
0
mirror of https://github.com/ipfs/kubo.git synced 2025-05-17 23:16:11 +08:00

feat: path consolidation (#10063)

This commit is contained in:
Henrique Dias
2023-10-06 16:14:44 +02:00
committed by GitHub
parent ecda7ae2f5
commit a7c6518497
70 changed files with 608 additions and 381 deletions

View File

@ -8,7 +8,7 @@ import (
iface "github.com/ipfs/boxo/coreiface"
caopts "github.com/ipfs/boxo/coreiface/options"
"github.com/ipfs/boxo/coreiface/path"
"github.com/ipfs/boxo/path"
"github.com/ipfs/go-cid"
"github.com/pkg/errors"
)
@ -24,7 +24,7 @@ type pinRefKeyList struct {
}
type pin struct {
path path.Resolved
path path.ImmutablePath
typ string
err error
}
@ -33,7 +33,7 @@ func (p pin) Err() error {
return p.err
}
func (p pin) Path() path.Resolved {
func (p pin) Path() path.ImmutablePath {
return p.path
}
@ -102,7 +102,7 @@ func (api *PinAPI) Ls(ctx context.Context, opts ...caopts.PinLsOption) (<-chan i
}
select {
case ch <- pin{typ: out.Type, path: path.IpldPath(c)}:
case ch <- pin{typ: out.Type, path: path.FromCid(c)}:
case <-ctx.Done():
return
}
@ -182,8 +182,8 @@ type badNode struct {
cid cid.Cid
}
func (n badNode) Path() path.Resolved {
return path.IpldPath(n.cid)
func (n badNode) Path() path.ImmutablePath {
return path.FromCid(n.cid)
}
func (n badNode) Err() error {