Remove content routing from bitswap network #535

Jorropo · 2024-01-03T18:17:41Z

Based on #534

codecov · 2024-01-03T18:21:41Z

Codecov Report

Attention: 18 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (move-providing-responsabilities@4060154). Click here to learn what that means.

❗ Current head 5eb2dbc differs from pull request most recent head 2dbd42a. Consider uploading reports for the commit 2dbd42a to get more accurate results

@@                        Coverage Diff                         @@
##             move-providing-responsabilities     #535   +/-   ##
==================================================================
  Coverage                                   ?   65.39%           
==================================================================
  Files                                      ?      204           
  Lines                                      ?    25386           
  Branches                                   ?        0           
==================================================================
  Hits                                       ?    16600           
  Misses                                     ?     7305           
  Partials                                   ?     1481

Files	Coverage Δ
bitswap/bitswap.go	`69.51% <ø> (ø)`
bitswap/client/client.go	`89.79% <100.00%> (ø)`
...tswap/client/internal/messagequeue/messagequeue.go	`83.53% <ø> (ø)`
bitswap/client/internal/session/session.go	`90.80% <100.00%> (ø)`
bitswap/network/ipfs_impl.go	`78.86% <100.00%> (ø)`
bitswap/options.go	`44.44% <100.00%> (ø)`
bitswap/server/server.go	`58.50% <100.00%> (ø)`
bitswap/testnet/peernet.go	`38.46% <100.00%> (ø)`
blockservice/test/mock.go	`100.00% <100.00%> (ø)`
examples/unixfs-file-cid/main.go	`41.21% <100.00%> (ø)`
... and 5 more

Keeps in sync with: - ipfs/boxo#534 - ipfs/boxo#535 - ipfs/boxo#536

Jorropo · 2024-01-11T18:07:28Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

This stack of pull requests is managed by Graphite. Learn more about stacking.

hacdias · 2024-01-12T13:06:48Z

CHANGELOG.md

@@ -18,9 +18,14 @@ The following emojis are used to highlight certain changes:

 * 🛠 `pinning/pinner`: you can now give a custom name when pinning a CID. To reflect this, the `Pinner` has been adjusted.
 - `blockservice` now have a `WithProvider` option, this allows to recreate the behavior of advertising added blocks the bitswap server used to do.
+- `bitswap` & `bitswap/client` now have a `WithContentSearch` option, this pickup the content routing job from `bitswap/network`.
+  It used to be a commun pattern for consumers which do not need external content routing to pass a [`routinghelpers.Null`](https://pkg.go.dev/github.com/libp2p/go-libp2p-routing-helpers#Null), now this can be ommited completely which is more efficient.


Suggested change

It used to be a commun pattern for consumers which do not need external content routing to pass a [`routinghelpers.Null`](https://pkg.go.dev/github.com/libp2p/go-libp2p-routing-helpers#Null), now this can be ommited completely which is more efficient.

It used to be a common pattern for consumers which do not need external content routing to pass a [`routinghelpers.Null`](https://pkg.go.dev/github.com/libp2p/go-libp2p-routing-helpers#Null), now this can be omitted completely which is more efficient.

hacdias · 2024-01-12T13:07:33Z

CHANGELOG.md

+- 🛠 `bitswap/network` no longer manages content routing, related Methods and function Arguments have been removed.
+  - `Network.ConnectTo` method has been changed from [`peer.ID`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#ID) to [`peer.AddrInfo`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#AddrInfo), given adding addresses hints used to be a side effect of the network. Theses now need to be passed in as values.


Suggested change

- 🛠 `bitswap/network` no longer manages content routing, related Methods and function Arguments have been removed.

- `Network.ConnectTo` method has been changed from [`peer.ID`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#ID) to [`peer.AddrInfo`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#AddrInfo), given adding addresses hints used to be a side effect of the network. Theses now need to be passed in as values.

- 🛠 `bitswap/network` no longer manages content routing, related methods and function arguments have been removed.

- `Network.ConnectTo` method has been changed from [`peer.ID`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#ID) to [`peer.AddrInfo`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#AddrInfo), given adding addresses hints used to be a side effect of the network. Theses now need to be passed in as values.

bitswap/testinstance/testinstance.go

hacdias

Considering the title, this seems to do what it says. Just left a comment in line with a question.

… to an option of the client Given that the previous commit remove the content advertising from the server, it did not made sense to share these paths on the network. The code has been reworked: - addresses aren't magically added to the peerstore as a side-effect of calling `Network.FindProvidersAsync`. Instead they are passed as hints to ConnectTo which copies libp2p `host.ConnectTo` API. - the providerquerymanager is completely shutdown when not using `WithContentSearch` option, this helps usecase where `routinghelpers.Null` is used for content routing and the consumer exclusively rely on broadcast, like networks where most peoples have all the content (Filecoin, Celestia, ...).

Keeps in sync with: - ipfs/boxo#578 - ipfs/boxo#534 - ipfs/boxo#535 - ipfs/boxo#536

gammazero · 2024-07-11T23:12:54Z

fetcher/impl/blockservice/fetcher_test.go

@@ -38,7 +37,7 @@ func TestFetchIPLDPrimeNode(t *testing.T) {
 		})
 	}))

-	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0*time.Millisecond))
+	net := tn.VirtualNetwork(delay.Fixed(0 * time.Millisecond))


Define a const for delay.

Jorropo requested a review from a team as a code owner January 3, 2024 18:17

This was referenced Jan 3, 2024

Remove provider query manager #536

Closed

bitswap move providing responsabilities from the server to blockservice & reprovider #528

Closed

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 2a2f368 to 1347809 Compare January 5, 2024 15:56

Jorropo added a commit to ipfs/kubo that referenced this pull request Jan 5, 2024

chore: update boxo for bitswap providing refactor

732d56c

Keeps in sync with: - ipfs/boxo#534 - ipfs/boxo#535 - ipfs/boxo#536

Jorropo mentioned this pull request Jan 5, 2024

chore: update boxo for bitswap providing refactor ipfs/kubo#10270

Draft

hacdias changed the base branch from main to move-providing-responsabilities January 8, 2024 12:59

Jorropo changed the base branch from move-providing-responsabilities to main January 11, 2024 17:20

Jorropo changed the base branch from main to move-providing-responsabilities January 11, 2024 18:07

Jorropo mentioned this pull request Jan 11, 2024

Move providing responsabilities from bitswap to blockservice #534

Closed

Jorropo force-pushed the move-providing-responsabilities branch from 29ff0cc to 94be73e Compare January 11, 2024 18:10

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 1347809 to 28f6549 Compare January 11, 2024 18:11

hacdias reviewed Jan 12, 2024

View reviewed changes

bitswap/testinstance/testinstance.go Show resolved Hide resolved

hacdias approved these changes Jan 12, 2024

View reviewed changes

Jorropo force-pushed the move-providing-responsabilities branch from 94be73e to ac0f6e0 Compare January 16, 2024 09:05

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 28f6549 to 301d5b5 Compare January 16, 2024 09:05

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 301d5b5 to d414841 Compare January 16, 2024 09:19

Jorropo force-pushed the move-providing-responsabilities branch from ac0f6e0 to e0d5341 Compare February 14, 2024 18:40

Jorropo requested a review from lidel as a code owner February 14, 2024 18:40

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from d414841 to 5eb2dbc Compare February 14, 2024 18:40

Jorropo mentioned this pull request Feb 14, 2024

Revert blockservice sessions context #578

Open

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 5eb2dbc to 0cd80af Compare February 16, 2024 13:47

Jorropo changed the base branch from move-providing-responsabilities to main February 16, 2024 13:48

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 0cd80af to 6740401 Compare February 16, 2024 13:48

Jorropo changed the base branch from main to move-providing-responsabilities February 16, 2024 14:09

Jorropo force-pushed the remove-content-routing-from-bitswap-network branch from 6740401 to 2dbd42a Compare February 16, 2024 14:09

Jorropo added a commit to ipfs/kubo that referenced this pull request Feb 16, 2024

chore: update boxo for bitswap providing refactor

dae471e

Keeps in sync with: - ipfs/boxo#578 - ipfs/boxo#534 - ipfs/boxo#535 - ipfs/boxo#536

gammazero reviewed Jul 11, 2024

View reviewed changes

hsanjuan mentioned this pull request Nov 14, 2024

Bitswap: move providing -> Exchange-layer, providerQueryManager -> routing #641

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove content routing from bitswap network #535

Remove content routing from bitswap network #535

Jorropo commented Jan 3, 2024

codecov bot commented Jan 3, 2024 •

edited

Loading

Jorropo commented Jan 11, 2024 •

edited

Loading

hacdias Jan 12, 2024

hacdias Jan 12, 2024

hacdias left a comment

gammazero Jul 11, 2024

	It used to be a commun pattern for consumers which do not need external content routing to pass a [`routinghelpers.Null`](https://pkg.go.dev/github.com/libp2p/go-libp2p-routing-helpers#Null), now this can be ommited completely which is more efficient.
	It used to be a common pattern for consumers which do not need external content routing to pass a [`routinghelpers.Null`](https://pkg.go.dev/github.com/libp2p/go-libp2p-routing-helpers#Null), now this can be omitted completely which is more efficient.

		- 🛠 `bitswap/network` no longer manages content routing, related Methods and function Arguments have been removed.
		- `Network.ConnectTo` method has been changed from [`peer.ID`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#ID) to [`peer.AddrInfo`](https://pkg.go.dev/github.com/libp2p/go-libp2p/core/peer#AddrInfo), given adding addresses hints used to be a side effect of the network. Theses now need to be passed in as values.

Remove content routing from bitswap network #535

Are you sure you want to change the base?

Remove content routing from bitswap network #535

Conversation

Jorropo commented Jan 3, 2024

codecov bot commented Jan 3, 2024 • edited Loading

Codecov Report

Jorropo commented Jan 11, 2024 • edited Loading

hacdias Jan 12, 2024

Choose a reason for hiding this comment

hacdias Jan 12, 2024

Choose a reason for hiding this comment

hacdias left a comment

Choose a reason for hiding this comment

gammazero Jul 11, 2024

Choose a reason for hiding this comment

codecov bot commented Jan 3, 2024 •

edited

Loading

Jorropo commented Jan 11, 2024 •

edited

Loading