@cryptotaxi247 / kubo / commits / a5668d22b

chore: update boxo for structification of ImmutablePath

Jorropo committed Oct 6, 2023 at 21:48 UTC a5668d22ba802afb1db269d47ce88dfb1f29473e
14 files changed +86 -84
client/rpc/object.go
+12 -12
@@ -43,7 +43,7 @@ func (api *ObjectAPI) New(ctx context.Context, opts ...caopts.ObjectNewOption) (
43 func (api *ObjectAPI) Put(ctx context.Context, r io.Reader, opts ...caopts.ObjectPutOption) (path.ImmutablePath, error) {
44 options, err := caopts.ObjectPutOptions(opts...)
45 if err != nil {
46 - return nil, err
46 + return path.ImmutablePath{}, err
47 }
48
49 var out objectOut
@@ -54,12 +54,12 @@ func (api *ObjectAPI) Put(ctx context.Context, r io.Reader, opts ...caopts.Objec
54 FileBody(r).
55 Exec(ctx, &out)
56 if err != nil {
57 - return nil, err
57 + return path.ImmutablePath{}, err
58 }
59
60 c, err := cid.Parse(out.Hash)
61 if err != nil {
62 - return nil, err
62 + return path.ImmutablePath{}, err
63 }
64
65 return path.FromCid(c), nil
@@ -156,7 +156,7 @@ func (api *ObjectAPI) Stat(ctx context.Context, p path.Path) (*iface.ObjectStat,
156 func (api *ObjectAPI) AddLink(ctx context.Context, base path.Path, name string, child path.Path, opts ...caopts.ObjectAddLinkOption) (path.ImmutablePath, error) {
157 options, err := caopts.ObjectAddLinkOptions(opts...)
158 if err != nil {
159 - return nil, err
159 + return path.ImmutablePath{}, err
160 }
161
162 var out objectOut
@@ -164,12 +164,12 @@ func (api *ObjectAPI) AddLink(ctx context.Context, base path.Path, name string,
164 Option("create", options.Create).
165 Exec(ctx, &out)
166 if err != nil {
167 - return nil, err
167 + return path.ImmutablePath{}, err
168 }
169
170 c, err := cid.Parse(out.Hash)
171 if err != nil {
172 - return nil, err
172 + return path.ImmutablePath{}, err
173 }
174
175 return path.FromCid(c), nil
@@ -180,12 +180,12 @@ func (api *ObjectAPI) RmLink(ctx context.Context, base path.Path, link string) (
180 err := api.core().Request("object/patch/rm-link", base.String(), link).
181 Exec(ctx, &out)
182 if err != nil {
183 - return nil, err
183 + return path.ImmutablePath{}, err
184 }
185
186 c, err := cid.Parse(out.Hash)
187 if err != nil {
188 - return nil, err
188 + return path.ImmutablePath{}, err
189 }
190
191 return path.FromCid(c), nil
@@ -197,12 +197,12 @@ func (api *ObjectAPI) AppendData(ctx context.Context, p path.Path, r io.Reader)
197 FileBody(r).
198 Exec(ctx, &out)
199 if err != nil {
200 - return nil, err
200 + return path.ImmutablePath{}, err
201 }
202
203 c, err := cid.Parse(out.Hash)
204 if err != nil {
205 - return nil, err
205 + return path.ImmutablePath{}, err
206 }
207
208 return path.FromCid(c), nil
@@ -214,12 +214,12 @@ func (api *ObjectAPI) SetData(ctx context.Context, p path.Path, r io.Reader) (pa
214 FileBody(r).
215 Exec(ctx, &out)
216 if err != nil {
217 - return nil, err
217 + return path.ImmutablePath{}, err
218 }
219
220 c, err := cid.Parse(out.Hash)
221 if err != nil {
222 - return nil, err
222 + return path.ImmutablePath{}, err
223 }
224
225 return path.FromCid(c), nil
client/rpc/path.go
+4 -4
@@ -17,22 +17,22 @@ func (api *HttpApi) ResolvePath(ctx context.Context, p path.Path) (path.Immutabl
17 var err error
18 if p.Namespace() == path.IPNSNamespace {
19 if p, err = api.Name().Resolve(ctx, p.String()); err != nil {
20 - return nil, nil, err
20 + return path.ImmutablePath{}, nil, err
21 }
22 }
23
24 if err := api.Request("dag/resolve", p.String()).Exec(ctx, &out); err != nil {
25 - return nil, nil, err
25 + return path.ImmutablePath{}, nil, err
26 }
27
28 p, err = path.NewPathFromSegments(p.Namespace(), out.Cid.String(), out.RemPath)
29 if err != nil {
30 - return nil, nil, err
30 + return path.ImmutablePath{}, nil, err
31 }
32
33 imPath, err := path.NewImmutablePath(p)
34 if err != nil {
35 - return nil, nil, err
35 + return path.ImmutablePath{}, nil, err
36 }
37
38 return imPath, path.StringToSegments(out.RemPath), nil
client/rpc/unixfs.go
+9 -9
@@ -29,12 +29,12 @@ type UnixfsAPI HttpApi
29 func (api *UnixfsAPI) Add(ctx context.Context, f files.Node, opts ...caopts.UnixfsAddOption) (path.ImmutablePath, error) {
30 options, _, err := caopts.UnixfsAddOptions(opts...)
31 if err != nil {
32 - return nil, err
32 + return path.ImmutablePath{}, err
33 }
34
35 mht, ok := mh.Codes[options.MhType]
36 if !ok {
37 - return nil, fmt.Errorf("unknowm mhType %d", options.MhType)
37 + return path.ImmutablePath{}, fmt.Errorf("unknowm mhType %d", options.MhType)
38 }
39
40 req := api.core().Request("add").
@@ -65,7 +65,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, f files.Node, opts ...caopts.Unix
65
66 version, err := api.core().loadRemoteVersion()
67 if err != nil {
68 - return nil, err
68 + return path.ImmutablePath{}, err
69 }
70 useEncodedAbsPaths := version.LT(encodedAbsolutePathVersion)
71 req.Body(files.NewMultiFileReader(d, false, useEncodedAbsPaths))
@@ -73,10 +73,10 @@ func (api *UnixfsAPI) Add(ctx context.Context, f files.Node, opts ...caopts.Unix
73 var out addEvent
74 resp, err := req.Send(ctx)
75 if err != nil {
76 - return nil, err
76 + return path.ImmutablePath{}, err
77 }
78 if resp.Error != nil {
79 - return nil, resp.Error
79 + return path.ImmutablePath{}, resp.Error
80 }
81 defer resp.Output.Close()
82 dec := json.NewDecoder(resp.Output)
@@ -88,7 +88,7 @@ loop:
88 case io.EOF:
89 break loop
90 default:
91 - return nil, err
91 + return path.ImmutablePath{}, err
92 }
93 out = evt
94
@@ -102,7 +102,7 @@ loop:
102 if out.Hash != "" {
103 c, err := cid.Parse(out.Hash)
104 if err != nil {
105 - return nil, err
105 + return path.ImmutablePath{}, err
106 }
107
108 ifevt.Path = path.FromCid(c)
@@ -111,14 +111,14 @@ loop:
111 select {
112 case options.Events <- ifevt:
113 case <-ctx.Done():
114 - return nil, ctx.Err()
114 + return path.ImmutablePath{}, ctx.Err()
115 }
116 }
117 }
118
119 c, err := cid.Parse(out.Hash)
120 if err != nil {
121 - return nil, err
121 + return path.ImmutablePath{}, err
122 }
123
124 return path.FromCid(c), nil
core/commands/add.go
+7 -6
@@ -5,7 +5,7 @@ import (
5 "fmt"
6 "io"
7 "os"
8 - "path"
8 + gopath "path"
9 "strings"
10
11 "github.com/ipfs/kubo/core/commands/cmdenv"
@@ -15,6 +15,7 @@ import (
15 "github.com/ipfs/boxo/coreiface/options"
16 "github.com/ipfs/boxo/files"
17 mfs "github.com/ipfs/boxo/mfs"
18 + "github.com/ipfs/boxo/path"
19 cmds "github.com/ipfs/go-ipfs-cmds"
20 ipld "github.com/ipfs/go-ipld-format"
21 mh "github.com/multiformats/go-multihash"
@@ -301,7 +302,7 @@ See 'dag export' and 'dag import' for more information.
302 return
303 }
304 // if MFS destination is a dir, append filename to the dir path
304 - toFilesDst += path.Base(addit.Name())
305 + toFilesDst += gopath.Base(addit.Name())
306 }
307
308 // error if we try to overwrite a preexisting file destination
@@ -310,9 +311,9 @@ See 'dag export' and 'dag import' for more information.
311 return
312 }
313
313 - _, err = mfs.Lookup(ipfsNode.FilesRoot, path.Dir(toFilesDst))
314 + _, err = mfs.Lookup(ipfsNode.FilesRoot, gopath.Dir(toFilesDst))
315 if err != nil {
315 - errCh <- fmt.Errorf("%s: MFS destination parent %q %q does not exist: %w", toFilesOptionName, toFilesDst, path.Dir(toFilesDst), err)
316 + errCh <- fmt.Errorf("%s: MFS destination parent %q %q does not exist: %w", toFilesOptionName, toFilesDst, gopath.Dir(toFilesDst), err)
317 return
318 }
319
@@ -339,14 +340,14 @@ See 'dag export' and 'dag import' for more information.
340 }
341
342 h := ""
342 - if output.Path != nil {
343 + if (output.Path != path.ImmutablePath{}) {
344 h = enc.Encode(output.Path.RootCid())
345 }
346
347 if !dir && addit.Name() != "" {
348 output.Name = addit.Name()
349 } else {
349 - output.Name = path.Join(addit.Name(), output.Name)
350 + output.Name = gopath.Join(addit.Name(), output.Name)
351 }
352
353 if err := res.Emit(&AddEvent{
core/commands/object/diff.go
+3 -2
@@ -5,6 +5,7 @@ import (
5 "io"
6
7 "github.com/ipfs/boxo/ipld/merkledag/dagutils"
8 + "github.com/ipfs/boxo/path"
9 cmds "github.com/ipfs/go-ipfs-cmds"
10
11 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
@@ -82,11 +83,11 @@ Example:
83 Path: change.Path,
84 }
85
85 - if change.Before != nil {
86 + if (change.Before != path.ImmutablePath{}) {
87 out[i].Before = change.Before.RootCid()
88 }
89
89 - if change.After != nil {
90 + if (change.After != path.ImmutablePath{}) {
91 out[i].After = change.After.RootCid()
92 }
93 }
core/coreapi/object.go
+25 -25
@@ -71,7 +71,7 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
71
72 options, err := caopts.ObjectPutOptions(opts...)
73 if err != nil {
74 - return nil, err
74 + return path.ImmutablePath{}, err
75 }
76 span.SetAttributes(
77 attribute.Bool("pin", options.Pin),
@@ -81,7 +81,7 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
81
82 data, err := io.ReadAll(io.LimitReader(src, inputLimit+10))
83 if err != nil {
84 - return nil, err
84 + return path.ImmutablePath{}, err
85 }
86
87 var dagnode *dag.ProtoNode
@@ -92,12 +92,12 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
92 decoder.DisallowUnknownFields()
93 err = decoder.Decode(node)
94 if err != nil {
95 - return nil, err
95 + return path.ImmutablePath{}, err
96 }
97
98 dagnode, err = deserializeNode(node, options.DataType)
99 if err != nil {
100 - return nil, err
100 + return path.ImmutablePath{}, err
101 }
102
103 case "protobuf":
@@ -107,20 +107,20 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
107 node := new(Node)
108 err = xml.Unmarshal(data, node)
109 if err != nil {
110 - return nil, err
110 + return path.ImmutablePath{}, err
111 }
112
113 dagnode, err = deserializeNode(node, options.DataType)
114 if err != nil {
115 - return nil, err
115 + return path.ImmutablePath{}, err
116 }
117
118 default:
119 - return nil, errors.New("unknown object encoding")
119 + return path.ImmutablePath{}, errors.New("unknown object encoding")
120 }
121
122 if err != nil {
123 - return nil, err
123 + return path.ImmutablePath{}, err
124 }
125
126 if options.Pin {
@@ -129,17 +129,17 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
129
130 err = api.dag.Add(ctx, dagnode)
131 if err != nil {
132 - return nil, err
132 + return path.ImmutablePath{}, err
133 }
134
135 if options.Pin {
136 if err := api.pinning.PinWithMode(ctx, dagnode.Cid(), pin.Recursive); err != nil {
137 - return nil, err
137 + return path.ImmutablePath{}, err
138 }
139
140 err = api.pinning.Flush(ctx)
141 if err != nil {
142 - return nil, err
142 + return path.ImmutablePath{}, err
143 }
144 }
145
@@ -223,23 +223,23 @@ func (api *ObjectAPI) AddLink(ctx context.Context, base path.Path, name string,
223
224 options, err := caopts.ObjectAddLinkOptions(opts...)
225 if err != nil {
226 - return nil, err
226 + return path.ImmutablePath{}, err
227 }
228 span.SetAttributes(attribute.Bool("create", options.Create))
229
230 baseNd, err := api.core().ResolveNode(ctx, base)
231 if err != nil {
232 - return nil, err
232 + return path.ImmutablePath{}, err
233 }
234
235 childNd, err := api.core().ResolveNode(ctx, child)
236 if err != nil {
237 - return nil, err
237 + return path.ImmutablePath{}, err
238 }
239
240 basePb, ok := baseNd.(*dag.ProtoNode)
241 if !ok {
242 - return nil, dag.ErrNotProtobuf
242 + return path.ImmutablePath{}, dag.ErrNotProtobuf
243 }
244
245 var createfunc func() *dag.ProtoNode
@@ -251,12 +251,12 @@ func (api *ObjectAPI) AddLink(ctx context.Context, base path.Path, name string,
251
252 err = e.InsertNodeAtPath(ctx, name, childNd, createfunc)
253 if err != nil {
254 - return nil, err
254 + return path.ImmutablePath{}, err
255 }
256
257 nnode, err := e.Finalize(ctx, api.dag)
258 if err != nil {
259 - return nil, err
259 + return path.ImmutablePath{}, err
260 }
261
262 return path.FromCid(nnode.Cid()), nil
@@ -271,24 +271,24 @@ func (api *ObjectAPI) RmLink(ctx context.Context, base path.Path, link string) (
271
272 baseNd, err := api.core().ResolveNode(ctx, base)
273 if err != nil {
274 - return nil, err
274 + return path.ImmutablePath{}, err
275 }
276
277 basePb, ok := baseNd.(*dag.ProtoNode)
278 if !ok {
279 - return nil, dag.ErrNotProtobuf
279 + return path.ImmutablePath{}, dag.ErrNotProtobuf
280 }
281
282 e := dagutils.NewDagEditor(basePb, api.dag)
283
284 err = e.RmLink(ctx, link)
285 if err != nil {
286 - return nil, err
286 + return path.ImmutablePath{}, err
287 }
288
289 nnode, err := e.Finalize(ctx, api.dag)
290 if err != nil {
291 - return nil, err
291 + return path.ImmutablePath{}, err
292 }
293
294 return path.FromCid(nnode.Cid()), nil
@@ -311,17 +311,17 @@ func (api *ObjectAPI) SetData(ctx context.Context, path path.Path, r io.Reader)
311 func (api *ObjectAPI) patchData(ctx context.Context, p path.Path, r io.Reader, appendData bool) (path.ImmutablePath, error) {
312 nd, err := api.core().ResolveNode(ctx, p)
313 if err != nil {
314 - return nil, err
314 + return path.ImmutablePath{}, err
315 }
316
317 pbnd, ok := nd.(*dag.ProtoNode)
318 if !ok {
319 - return nil, dag.ErrNotProtobuf
319 + return path.ImmutablePath{}, dag.ErrNotProtobuf
320 }
321
322 data, err := io.ReadAll(r)
323 if err != nil {
324 - return nil, err
324 + return path.ImmutablePath{}, err
325 }
326
327 if appendData {
@@ -331,7 +331,7 @@ func (api *ObjectAPI) patchData(ctx context.Context, p path.Path, r io.Reader, a
331
332 err = api.dag.Add(ctx, pbnd)
333 if err != nil {
334 - return nil, err
334 + return path.ImmutablePath{}, err
335 }
336
337 return path.FromCid(pbnd.Cid()), nil
core/coreapi/path.go
+7 -7
@@ -42,9 +42,9 @@ func (api *CoreAPI) ResolvePath(ctx context.Context, p path.Path) (path.Immutabl
42
43 p, err := resolve.ResolveIPNS(ctx, api.namesys, p)
44 if err == resolve.ErrNoNamesys {
45 - return nil, nil, coreiface.ErrOffline
45 + return path.ImmutablePath{}, nil, coreiface.ErrOffline
46 } else if err != nil {
47 - return nil, nil, err
47 + return path.ImmutablePath{}, nil, err
48 }
49
50 var resolver ipfspathresolver.Resolver
@@ -54,17 +54,17 @@ func (api *CoreAPI) ResolvePath(ctx context.Context, p path.Path) (path.Immutabl
54 case path.IPFSNamespace:
55 resolver = api.unixFSPathResolver
56 default:
57 - return nil, nil, fmt.Errorf("unsupported path namespace: %s", p.Namespace())
57 + return path.ImmutablePath{}, nil, fmt.Errorf("unsupported path namespace: %s", p.Namespace())
58 }
59
60 imPath, err := path.NewImmutablePath(p)
61 if err != nil {
62 - return nil, nil, err
62 + return path.ImmutablePath{}, nil, err
63 }
64
65 node, remainder, err := resolver.ResolveToLastNode(ctx, imPath)
66 if err != nil {
67 - return nil, nil, err
67 + return path.ImmutablePath{}, nil, err
68 }
69
70 segments := []string{p.Namespace(), node.String()}
@@ -72,12 +72,12 @@ func (api *CoreAPI) ResolvePath(ctx context.Context, p path.Path) (path.Immutabl
72
73 p, err = path.NewPathFromSegments(segments...)
74 if err != nil {
75 - return nil, nil, err
75 + return path.ImmutablePath{}, nil, err
76 }
77
78 imPath, err = path.NewImmutablePath(p)
79 if err != nil {
80 - return nil, nil, err
80 + return path.ImmutablePath{}, nil, err
81 }
82
83 return imPath, remainder, nil
core/coreapi/unixfs.go
+10 -10
@@ -64,7 +64,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
64
65 settings, prefix, err := options.UnixfsAddOptions(opts...)
66 if err != nil {
67 - return nil, err
67 + return path.ImmutablePath{}, err
68 }
69
70 span.SetAttributes(
@@ -85,7 +85,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
85
86 cfg, err := api.repo.Config()
87 if err != nil {
88 - return nil, err
88 + return path.ImmutablePath{}, err
89 }
90
91 // check if repo will exceed storage limit if added
@@ -97,7 +97,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
97 //}
98
99 if settings.NoCopy && !(cfg.Experimental.FilestoreEnabled || cfg.Experimental.UrlstoreEnabled) {
100 - return nil, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#ipfs-filestore")
100 + return path.ImmutablePath{}, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#ipfs-filestore")
101 }
102
103 addblockstore := api.blockstore
@@ -110,7 +110,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
110 if settings.OnlyHash {
111 node, err := getOrCreateNilNode()
112 if err != nil {
113 - return nil, err
113 + return path.ImmutablePath{}, err
114 }
115 addblockstore = node.Blockstore
116 exch = node.Exchange
@@ -144,7 +144,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
144
145 fileAdder, err := coreunix.NewAdder(ctx, pinning, addblockstore, syncDserv)
146 if err != nil {
147 - return nil, err
147 + return path.ImmutablePath{}, err
148 }
149
150 fileAdder.Chunker = settings.Chunker
@@ -164,7 +164,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
164 case options.TrickleLayout:
165 fileAdder.Trickle = true
166 default:
167 - return nil, fmt.Errorf("unknown layout: %d", settings.Layout)
167 + return path.ImmutablePath{}, fmt.Errorf("unknown layout: %d", settings.Layout)
168 }
169
170 if settings.Inline {
@@ -180,11 +180,11 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
180 // Use the same prefix for the "empty" MFS root as for the file adder.
181 err := emptyDirNode.SetCidBuilder(fileAdder.CidBuilder)
182 if err != nil {
183 - return nil, err
183 + return path.ImmutablePath{}, err
184 }
185 mr, err := mfs.NewRoot(ctx, md, emptyDirNode, nil)
186 if err != nil {
187 - return nil, err
187 + return path.ImmutablePath{}, err
188 }
189
190 fileAdder.SetMfsRoot(mr)
@@ -192,12 +192,12 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
192
193 nd, err := fileAdder.AddAllAndPin(ctx, files)
194 if err != nil {
195 - return nil, err
195 + return path.ImmutablePath{}, err
196 }
197
198 if !settings.OnlyHash {
199 if err := api.provider.Provide(nd.Cid()); err != nil {
200 - return nil, err
200 + return path.ImmutablePath{}, err
201 }
202 }
203
docs/examples/kubo-as-a-library/go.mod
+1 -1
@@ -7,7 +7,7 @@ go 1.20
7 replace github.com/ipfs/kubo => ./../../..
8
9 require (
10 - github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664
10 + github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea
11 github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
12 github.com/libp2p/go-libp2p v0.31.0
13 github.com/multiformats/go-multiaddr v0.11.0
docs/examples/kubo-as-a-library/go.sum
+2 -2
@@ -300,8 +300,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
300 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
301 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
302 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
303 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664 h1:wserB+u/lpguBpxuKNNzwJR+rOSHxWufm3ZzNgN3d24=
304 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
303 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea h1:CygWxN8BL+d1F6PBOI+02UKqkpASP0ai459aw6ANZTg=
304 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
305 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
306 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
307 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
go.mod
+1 -1
@@ -15,7 +15,7 @@ require (
15 github.com/fsnotify/fsnotify v1.6.0
16 github.com/google/uuid v1.3.1
17 github.com/hashicorp/go-multierror v1.1.1
18 - github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664
18 + github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea
19 github.com/ipfs/go-block-format v0.2.0
20 github.com/ipfs/go-cid v0.4.1
21 github.com/ipfs/go-cidutil v0.1.0
go.sum
+2 -2
@@ -335,8 +335,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
335 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
336 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
337 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
338 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664 h1:wserB+u/lpguBpxuKNNzwJR+rOSHxWufm3ZzNgN3d24=
339 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
338 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea h1:CygWxN8BL+d1F6PBOI+02UKqkpASP0ai459aw6ANZTg=
339 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
340 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
341 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
342 github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
test/dependencies/go.mod
+1 -1
@@ -7,7 +7,7 @@ replace github.com/ipfs/kubo => ../../
7 require (
8 github.com/Kubuxu/gocovmerge v0.0.0-20161216165753-7ecaa51963cd
9 github.com/golangci/golangci-lint v1.54.1
10 - github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664
10 + github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea
11 github.com/ipfs/go-cid v0.4.1
12 github.com/ipfs/go-cidutil v0.1.0
13 github.com/ipfs/go-datastore v0.6.0
test/dependencies/go.sum
+2 -2
@@ -396,8 +396,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
396 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
397 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
398 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
399 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664 h1:wserB+u/lpguBpxuKNNzwJR+rOSHxWufm3ZzNgN3d24=
400 -github.com/ipfs/boxo v0.13.2-0.20231006140423-85c180e26664/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
399 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea h1:CygWxN8BL+d1F6PBOI+02UKqkpASP0ai459aw6ANZTg=
400 +github.com/ipfs/boxo v0.13.2-0.20231009073559-45c797e0ccea/go.mod h1:btrtHy0lmO1ODMECbbEY1pxNtrLilvKSYLoGQt1yYCk=
401 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
402 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
403 github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=