chore: update go-car
Jorropo committed
Jul 6, 2022 at 15:05 UTC
cbf5fdae5517b06491deba2d3cc31b7ff41451fe
4 files changed
+15
-15
core/commands/dag/export.go
+3
-3
@@ -134,12 +134,12 @@ func finishCLIExport(res cmds.Response, re cmds.ResponseEmitter) error {
134
}
135
}
136
137
+// FIXME(@Jorropo): https://github.com/ipld/go-car/issues/315
138
type dagStore struct {
139
dag iface.APIDagService
140
ctx context.Context
141
}
142
142
-func (ds dagStore) Get(c cid.Cid) (blocks.Block, error) {
143
- obj, err := ds.dag.Get(ds.ctx, c)
144
- return obj, err
143
+func (ds dagStore) Get(_ context.Context, c cid.Cid) (blocks.Block, error) {
144
+ return ds.dag.Get(ds.ctx, c)
145
}
core/corehttp/gateway_handler_car.go
+3
-3
@@ -86,12 +86,12 @@ func (i *gatewayHandler) serveCAR(ctx context.Context, w http.ResponseWriter, r
86
i.carStreamGetMetric.WithLabelValues(contentPath.Namespace()).Observe(time.Since(begin).Seconds())
87
}
88
89
+// FIXME(@Jorropo): https://github.com/ipld/go-car/issues/315
90
type dagStore struct {
91
dag coreiface.APIDagService
92
ctx context.Context
93
}
94
94
-func (ds dagStore) Get(c cid.Cid) (blocks.Block, error) {
95
- obj, err := ds.dag.Get(ds.ctx, c)
96
- return obj, err
95
+func (ds dagStore) Get(_ context.Context, c cid.Cid) (blocks.Block, error) {
96
+ return ds.dag.Get(ds.ctx, c)
97
}
go.mod
+3
-3
@@ -60,8 +60,8 @@ require (
60
github.com/ipfs/go-verifcid v0.0.1
61
github.com/ipfs/interface-go-ipfs-core v0.7.0
62
github.com/ipfs/tar-utils v0.0.2
63
- github.com/ipld/go-car v0.3.2
64
- github.com/ipld/go-car/v2 v2.1.1
63
+ github.com/ipld/go-car v0.4.0
64
+ github.com/ipld/go-car/v2 v2.4.0
65
github.com/ipld/go-codec-dagpb v1.4.0
66
github.com/ipld/go-ipld-prime v0.16.0
67
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
@@ -87,7 +87,7 @@ require (
87
github.com/multiformats/go-multiaddr v0.5.0
88
github.com/multiformats/go-multiaddr-dns v0.3.1
89
github.com/multiformats/go-multibase v0.0.3
90
- github.com/multiformats/go-multicodec v0.4.1
90
+ github.com/multiformats/go-multicodec v0.5.0
91
github.com/multiformats/go-multihash v0.2.0
92
github.com/opentracing/opentracing-go v1.2.0
93
github.com/pkg/errors v0.9.1
go.sum
+6
-6
@@ -655,11 +655,11 @@ github.com/ipfs/interface-go-ipfs-core v0.7.0 h1:7tb+2upz8oCcjIyjo1atdMk+P+u7wPm
655
github.com/ipfs/interface-go-ipfs-core v0.7.0/go.mod h1:lF27E/nnSPbylPqKVXGZghal2hzifs3MmjyiEjnc9FY=
656
github.com/ipfs/tar-utils v0.0.2 h1:UNgHB4x/PPzbMkmJi+7EqC9LNMPDztOVSnx1HAqSNg4=
657
github.com/ipfs/tar-utils v0.0.2/go.mod h1:4qlnRWgTVljIMhSG2SqRYn66NT+3wrv/kZt9V+eqxDM=
658
-github.com/ipld/go-car v0.3.2 h1:V9wt/80FNfbMRWSD98W5br6fyjUAyVgI2lDOTZX16Lg=
659
-github.com/ipld/go-car v0.3.2/go.mod h1:WEjynkVt04dr0GwJhry0KlaTeSDEiEYyMPOxDBQ17KE=
660
-github.com/ipld/go-car/v2 v2.1.1 h1:saaKz4nC0AdfCGHLYKeXLGn8ivoPC54fyS55uyOLKwA=
658
+github.com/ipld/go-car v0.4.0 h1:U6W7F1aKF/OJMHovnOVdst2cpQE5GhmHibQkAixgNcQ=
659
+github.com/ipld/go-car v0.4.0/go.mod h1:Uslcn4O9cBKK9wqHm/cLTFacg6RAPv6LZx2mxd2Ypl4=
660
github.com/ipld/go-car/v2 v2.1.1/go.mod h1:+2Yvf0Z3wzkv7NeI69i8tuZ+ft7jyjPYIWZzeVNeFcI=
662
-github.com/ipld/go-codec-dagpb v1.2.0/go.mod h1:6nBN7X7h8EOsEejZGqC7tej5drsdBAXbMHyBT+Fne5s=
661
+github.com/ipld/go-car/v2 v2.4.0 h1:8jI6/iKlyLqRZzLz31jFWTqKvslaVzFsin305sOuqNQ=
662
+github.com/ipld/go-car/v2 v2.4.0/go.mod h1:zjpRf0Jew9gHqSvjsKVyoq9OY9SWoEKdYCQUKVaaPT0=
663
github.com/ipld/go-codec-dagpb v1.3.0/go.mod h1:ga4JTU3abYApDC3pZ00BC2RSvC3qfBb9MSJkMLSwnhA=
664
github.com/ipld/go-codec-dagpb v1.3.1/go.mod h1:ErNNglIi5KMur/MfFE/svtgQthzVvf+43MrzLbpcIZY=
665
github.com/ipld/go-codec-dagpb v1.4.0 h1:VqADPIFng8G4vz5EQytmmcx/2gEgOHfBuw/kIuCgDAY=
@@ -667,7 +667,6 @@ github.com/ipld/go-codec-dagpb v1.4.0/go.mod h1:ErNNglIi5KMur/MfFE/svtgQthzVvf+4
667
github.com/ipld/go-ipld-prime v0.9.0/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
668
github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
669
github.com/ipld/go-ipld-prime v0.11.0/go.mod h1:+WIAkokurHmZ/KwzDOMUuoeJgaRQktHtEaLglS3ZeV8=
670
-github.com/ipld/go-ipld-prime v0.12.3/go.mod h1:PaeLYq8k6dJLmDUSLrzkEpoGV4PEfe/1OtFN/eALOc8=
670
github.com/ipld/go-ipld-prime v0.14.0/go.mod h1:9ASQLwUFLptCov6lIYc70GRB4V7UTyLD0IJtrDJe6ZM=
671
github.com/ipld/go-ipld-prime v0.14.1/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0=
672
github.com/ipld/go-ipld-prime v0.16.0 h1:RS5hhjB/mcpeEPJvfyj0qbOj/QL+/j05heZ0qa97dVo=
@@ -1253,8 +1252,9 @@ github.com/multiformats/go-multicodec v0.2.0/go.mod h1:/y4YVwkfMyry5kFbMTbLJKErh
1252
github.com/multiformats/go-multicodec v0.3.0/go.mod h1:qGGaQmioCDh+TeFOnxrbU0DaIPw8yFgAZgFG0V7p1qQ=
1253
github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
1254
github.com/multiformats/go-multicodec v0.3.1-0.20211210143421-a526f306ed2c/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
1256
-github.com/multiformats/go-multicodec v0.4.1 h1:BSJbf+zpghcZMZrwTYBGwy0CPcVZGWiC72Cp8bBd4R4=
1255
github.com/multiformats/go-multicodec v0.4.1/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
1256
+github.com/multiformats/go-multicodec v0.5.0 h1:EgU6cBe/D7WRwQb1KmnBvU7lrcFGMggZVTPtOW9dDHs=
1257
+github.com/multiformats/go-multicodec v0.5.0/go.mod h1:DiY2HFaEp5EhEXb/iYzVAunmyX/aSFMxq2KMKfWEues=
1258
github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
1259
github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
1260
github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=