Skip to content

Commit 444f0e8

Browse files
hacdiashacdias
committed
update with new boxo
1 parent b31dd53 commit 444f0e8

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

‎core/node/provider.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,13 @@ func newProvidingStrategy(onlyPinned, onlyRoots bool) interface{} {
163163
return provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher)
164164
}
165165

166-
var later provider.KeyChanFunc
167166
if onlyPinned {
168-
later = provider.NewPinnedProvider(false, in.Pinner, in.IPLDFetcher)
169-
} else {
170-
later = provider.NewBlockstoreProvider(in.Blockstore)
167+
return provider.NewPinnedProvider(false, in.Pinner, in.IPLDFetcher)
171168
}
172169

173-
roots := provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher)
174-
return provider.NewPrioritizedProvider(roots, later)
170+
return provider.NewPrioritizedProvider(
171+
provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher),
172+
provider.NewBlockstoreProvider(in.Blockstore),
173+
)
175174
}
176175
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toolchain go1.22.0
99
replace github.com/ipfs/kubo => ./../../..
1010

1111
require (
12-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8
12+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e
1313
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
1414
github.com/libp2p/go-libp2p v0.33.2
1515
github.com/multiformats/go-multiaddr v0.12.3

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
266266
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
267267
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
268268
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
269-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8 h1:3YJFMzYwdJNGd+YucvZ8cIDrhdZ7Ngb9JznK/7zm6+0=
270-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
269+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e h1:IsQoZp6trs8E8x1IkLeHwZ4d3bcUyciUpu6zw8Hv6DE=
270+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
271271
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
272272
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
273273
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/hashicorp/go-multierror v1.1.1
1818
github.com/ipfs-shipyard/nopfs v0.0.12
1919
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c
20-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8
20+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e
2121
github.com/ipfs/go-block-format v0.2.0
2222
github.com/ipfs/go-cid v0.4.1
2323
github.com/ipfs/go-cidutil v0.1.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
329329
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
330330
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
331331
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
332-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8 h1:3YJFMzYwdJNGd+YucvZ8cIDrhdZ7Ngb9JznK/7zm6+0=
333-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
332+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e h1:IsQoZp6trs8E8x1IkLeHwZ4d3bcUyciUpu6zw8Hv6DE=
333+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
334334
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
335335
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
336336
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=

‎test/dependencies/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ require (
105105
github.com/hexops/gotextdiff v1.0.3 // indirect
106106
github.com/inconshreveable/mousetrap v1.1.0 // indirect
107107
github.com/ipfs/bbloom v0.0.4 // indirect
108-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8 // indirect
108+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e // indirect
109109
github.com/ipfs/go-block-format v0.2.0 // indirect
110110
github.com/ipfs/go-cid v0.4.1 // indirect
111111
github.com/ipfs/go-datastore v0.6.0 // indirect

‎test/dependencies/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
362362
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
363363
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
364364
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
365-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8 h1:3YJFMzYwdJNGd+YucvZ8cIDrhdZ7Ngb9JznK/7zm6+0=
366-
github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
365+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e h1:IsQoZp6trs8E8x1IkLeHwZ4d3bcUyciUpu6zw8Hv6DE=
366+
github.com/ipfs/boxo v0.18.1-0.20240408152325-558d9c78084e/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
367367
github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=
368368
github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
369369
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=

0 commit comments

Comments
 (0)