update with new boxo

ipfs · Apr 8, 2024 · 8f654b2 · 8f654b2
1 parent 9db17fb
commit 8f654b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/core/node/provider.go b/core/node/provider.go
@@ -163,14 +163,13 @@ func newProvidingStrategy(onlyPinned, onlyRoots bool) interface{} {
 			return provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher)
 		}
 
-		var later provider.KeyChanFunc
 		if onlyPinned {
-			later = provider.NewPinnedProvider(false, in.Pinner, in.IPLDFetcher)
-		} else {
-			later = provider.NewBlockstoreProvider(in.Blockstore)
+			return provider.NewPinnedProvider(false, in.Pinner, in.IPLDFetcher)
 		}
 
-		roots := provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher)
-		return provider.NewPrioritizedProvider(roots, later)
+		return provider.NewPrioritizedProvider(
+			provider.NewPinnedProvider(true, in.Pinner, in.IPLDFetcher),
+			provider.NewBlockstoreProvider(in.Blockstore),
+		)
 	}
 }
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/ipfs-shipyard/nopfs v0.0.12
 	github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c
-	github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8
+	github.com/ipfs/boxo v0.18.1-0.20240408151515-42b4e9a11bd0
 	github.com/ipfs/go-block-format v0.2.0
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipfs/go-cidutil v0.1.0

diff --git a/go.sum b/go.sum
@@ -331,6 +331,8 @@ github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
 github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8 h1:3YJFMzYwdJNGd+YucvZ8cIDrhdZ7Ngb9JznK/7zm6+0=
 github.com/ipfs/boxo v0.18.1-0.20240404105922-3182484b86c8/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
+github.com/ipfs/boxo v0.18.1-0.20240408151515-42b4e9a11bd0 h1:GxtyImEfcdoJ01w/0NQJbhrDlUJgyF99Ob7gb2brJsQ=
+github.com/ipfs/boxo v0.18.1-0.20240408151515-42b4e9a11bd0/go.mod h1:V5gJzbIMwKEXrg3IdvAxIdF7UPgU4RsXmNGS8MQ/0D4=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=