Skip to content

Commit f20c980

Browse files
JorropoJorropo
committed
chore: bump go-libipfs to replace go-block-format
Includes changes from: - ipfs/go-block-format#37 - ipfs/boxo#58
1 parent 644f0ae commit f20c980

File tree

14 files changed

+90
-45
lines changed

14 files changed

+90
-45
lines changed

‎core/commands/dag/export.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"time"
1010

1111
"github.com/cheggaaa/pb"
12-
blocks "github.com/ipfs/go-block-format"
1312
cid "github.com/ipfs/go-cid"
1413
ipld "github.com/ipfs/go-ipld-format"
14+
blocks "github.com/ipfs/go-libipfs/blocks"
1515
iface "github.com/ipfs/interface-go-ipfs-core"
1616
"github.com/ipfs/kubo/core/commands/cmdenv"
1717

‎core/commands/dag/put.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"bytes"
55
"fmt"
66

7-
blocks "github.com/ipfs/go-block-format"
87
"github.com/ipfs/go-cid"
98
ipldlegacy "github.com/ipfs/go-ipld-legacy"
9+
blocks "github.com/ipfs/go-libipfs/blocks"
1010
"github.com/ipfs/kubo/core/commands/cmdenv"
1111
"github.com/ipfs/kubo/core/commands/cmdutils"
1212
"github.com/ipld/go-ipld-prime/multicodec"

‎core/coreapi/block.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"errors"
77
"io"
88

9-
blocks "github.com/ipfs/go-block-format"
109
cid "github.com/ipfs/go-cid"
1110
pin "github.com/ipfs/go-ipfs-pinner"
11+
blocks "github.com/ipfs/go-libipfs/blocks"
1212
coreiface "github.com/ipfs/interface-go-ipfs-core"
1313
caopts "github.com/ipfs/interface-go-ipfs-core/options"
1414
path "github.com/ipfs/interface-go-ipfs-core/path"

‎core/corehttp/gateway_handler_car.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net/http"
77
"time"
88

9-
blocks "github.com/ipfs/go-block-format"
109
cid "github.com/ipfs/go-cid"
10+
blocks "github.com/ipfs/go-libipfs/blocks"
1111
coreiface "github.com/ipfs/interface-go-ipfs-core"
1212
ipath "github.com/ipfs/interface-go-ipfs-core/path"
1313
"github.com/ipfs/kubo/tracing"

‎core/coreunix/add_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"github.com/ipfs/kubo/gc"
1515
"github.com/ipfs/kubo/repo"
1616

17-
blocks "github.com/ipfs/go-block-format"
1817
"github.com/ipfs/go-blockservice"
1918
"github.com/ipfs/go-cid"
2019
"github.com/ipfs/go-datastore"
2120
syncds "github.com/ipfs/go-datastore/sync"
2221
blockstore "github.com/ipfs/go-ipfs-blockstore"
2322
pi "github.com/ipfs/go-ipfs-posinfo"
23+
blocks "github.com/ipfs/go-libipfs/blocks"
2424
"github.com/ipfs/go-libipfs/files"
2525
dag "github.com/ipfs/go-merkledag"
2626
coreiface "github.com/ipfs/interface-go-ipfs-core"

‎docs/examples/kubo-as-a-library/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.18
77
replace github.com/ipfs/kubo => ./../../..
88

99
require (
10-
github.com/ipfs/go-libipfs v0.2.0
10+
github.com/ipfs/go-libipfs v0.3.0
1111
github.com/ipfs/interface-go-ipfs-core v0.8.2
1212
github.com/ipfs/kubo v0.14.0-rc1
1313
github.com/libp2p/go-libp2p v0.24.2
@@ -63,7 +63,7 @@ require (
6363
github.com/ipfs/bbloom v0.0.4 // indirect
6464
github.com/ipfs/go-bitfield v1.0.0 // indirect
6565
github.com/ipfs/go-bitswap v0.11.0 // indirect
66-
github.com/ipfs/go-block-format v0.0.3 // indirect
66+
github.com/ipfs/go-block-format v0.1.0 // indirect
6767
github.com/ipfs/go-blockservice v0.5.0 // indirect
6868
github.com/ipfs/go-cid v0.3.2 // indirect
6969
github.com/ipfs/go-cidutil v0.1.0 // indirect

‎docs/examples/kubo-as-a-library/go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,9 @@ github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1Hy
423423
github.com/ipfs/go-bitswap v0.11.0/go.mod h1:05aE8H3XOU+LXpTedeAS0OZpcO1WFsj5niYQH9a1Tmk=
424424
github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
425425
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
426-
github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc=
427426
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
427+
github.com/ipfs/go-block-format v0.1.0 h1:1DYLENGQUVWVvZ9tMmZX2KVi0ALyPxxyP6jn8NuCxZY=
428+
github.com/ipfs/go-block-format v0.1.0/go.mod h1:+McEIT+g52p+zz5xGAABGSOKrzmrdX97bc0USBdWPUs=
428429
github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
429430
github.com/ipfs/go-blockservice v0.2.1/go.mod h1:k6SiwmgyYgs4M/qt+ww6amPeUH9EISLRBnvUurKJhi8=
430431
github.com/ipfs/go-blockservice v0.3.0/go.mod h1:P5ppi8IHDC7O+pA0AlGTF09jruB2h+oP3wVVaZl8sfk=
@@ -546,8 +547,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
546547
github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
547548
github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
548549
github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
549-
github.com/ipfs/go-libipfs v0.2.0 h1:MedvelDEddPYL3iDLoqAsviLeXUiwB1F2t8fkzx9/EU=
550-
github.com/ipfs/go-libipfs v0.2.0/go.mod h1:qX0d9h+wu53PFtCTXxdXVBakd6ZCvGDdkZUKmdLMLx0=
550+
github.com/ipfs/go-libipfs v0.3.0 h1:YvzFWGcl88eiz2tjOheNqaeQseH+dW3fUKrSaHOG/dU=
551+
github.com/ipfs/go-libipfs v0.3.0/go.mod h1:pSUHZ5qPJTAidsxe9bAeHp3KIiw2ODEW2a2kM3v+iXI=
551552
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
552553
github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
553554
github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
github.com/google/uuid v1.3.0
1919
github.com/hashicorp/go-multierror v1.1.1
2020
github.com/ipfs/go-bitswap v0.11.0
21-
github.com/ipfs/go-block-format v0.0.3
2221
github.com/ipfs/go-blockservice v0.5.0
2322
github.com/ipfs/go-cid v0.3.2
2423
github.com/ipfs/go-cidutil v0.1.0
@@ -49,7 +48,7 @@ require (
4948
github.com/ipfs/go-ipld-git v0.1.1
5049
github.com/ipfs/go-ipld-legacy v0.1.1
5150
github.com/ipfs/go-ipns v0.3.0
52-
github.com/ipfs/go-libipfs v0.2.0
51+
github.com/ipfs/go-libipfs v0.3.0
5352
github.com/ipfs/go-log v1.0.5
5453
github.com/ipfs/go-log/v2 v2.5.1
5554
github.com/ipfs/go-merkledag v0.9.0
@@ -158,6 +157,7 @@ require (
158157
github.com/huin/goupnp v1.0.3 // indirect
159158
github.com/ipfs/bbloom v0.0.4 // indirect
160159
github.com/ipfs/go-bitfield v1.0.0 // indirect
160+
github.com/ipfs/go-block-format v0.1.0 // indirect
161161
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
162162
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
163163
github.com/ipfs/go-ipfs-pq v0.0.2 // indirect

‎go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,9 @@ github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1Hy
441441
github.com/ipfs/go-bitswap v0.11.0/go.mod h1:05aE8H3XOU+LXpTedeAS0OZpcO1WFsj5niYQH9a1Tmk=
442442
github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
443443
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
444-
github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc=
445444
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
445+
github.com/ipfs/go-block-format v0.1.0 h1:1DYLENGQUVWVvZ9tMmZX2KVi0ALyPxxyP6jn8NuCxZY=
446+
github.com/ipfs/go-block-format v0.1.0/go.mod h1:+McEIT+g52p+zz5xGAABGSOKrzmrdX97bc0USBdWPUs=
446447
github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
447448
github.com/ipfs/go-blockservice v0.2.1/go.mod h1:k6SiwmgyYgs4M/qt+ww6amPeUH9EISLRBnvUurKJhi8=
448449
github.com/ipfs/go-blockservice v0.3.0/go.mod h1:P5ppi8IHDC7O+pA0AlGTF09jruB2h+oP3wVVaZl8sfk=
@@ -568,8 +569,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
568569
github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
569570
github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
570571
github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
571-
github.com/ipfs/go-libipfs v0.2.0 h1:MedvelDEddPYL3iDLoqAsviLeXUiwB1F2t8fkzx9/EU=
572-
github.com/ipfs/go-libipfs v0.2.0/go.mod h1:qX0d9h+wu53PFtCTXxdXVBakd6ZCvGDdkZUKmdLMLx0=
572+
github.com/ipfs/go-libipfs v0.3.0 h1:YvzFWGcl88eiz2tjOheNqaeQseH+dW3fUKrSaHOG/dU=
573+
github.com/ipfs/go-libipfs v0.3.0/go.mod h1:pSUHZ5qPJTAidsxe9bAeHp3KIiw2ODEW2a2kM3v+iXI=
573574
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
574575
github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
575576
github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=

‎test/integration/bitswap_wo_routing_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"context"
66
"testing"
77

8-
blocks "github.com/ipfs/go-block-format"
98
"github.com/ipfs/go-cid"
9+
blocks "github.com/ipfs/go-libipfs/blocks"
1010
"github.com/ipfs/kubo/core"
1111
coremock "github.com/ipfs/kubo/core/mock"
1212
"github.com/ipfs/kubo/core/node/libp2p"

‎testplans/bitswap/go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ module github.com/ipfs/go-ipfs/testplans/bitswap
33
require (
44
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
55
github.com/ipfs/go-bitswap v0.10.1
6-
github.com/ipfs/go-block-format v0.0.3
7-
github.com/ipfs/go-cid v0.2.0
8-
github.com/ipfs/go-datastore v0.5.1
6+
github.com/ipfs/go-block-format v0.1.0 // indirect
7+
github.com/ipfs/go-cid v0.3.2
8+
github.com/ipfs/go-datastore v0.6.0
99
github.com/ipfs/go-ipfs-blockstore v1.2.0
1010
github.com/ipfs/go-ipfs-exchange-interface v0.2.0
1111
github.com/ipfs/go-ipfs-regression v0.0.1
12+
github.com/ipfs/go-libipfs v0.3.0
1213
github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db // indirect
13-
github.com/libp2p/go-libp2p v0.22.0
14+
github.com/libp2p/go-libp2p v0.23.4
1415
github.com/libp2p/go-libp2p-kad-dht v0.18.0
15-
github.com/multiformats/go-multiaddr v0.6.0
16+
github.com/multiformats/go-multiaddr v0.8.0
1617
github.com/multiformats/go-multihash v0.2.1
1718
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
1819
github.com/smartystreets/assertions v1.0.1 // indirect

0 commit comments

Comments
 (0)