swarm: fix DialPeer behaviour for transient connections #2547
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sukunrt
commented
Aug 31, 2023
p2p/test/swarm/swarm_test.go
Outdated
Comment on lines
61
to
60
| // swarm.DialPeer should connect over transient connections | ||
| conn1, err := h1.Network().DialPeer(context.Background(), h2.ID()) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, conn1) | ||
|
|
||
| conn2, err := h1.Network().DialPeer(context.Background(), h2.ID()) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, conn2) |
There was a problem hiding this comment.
On current master, the first call succeeds while the second one fails.
This fixes a bug where the first call to `swarm.DialPeer` succeeds and returns a transient connection with no error while the second call to DialPeer returns `(nil, network.ErrTransientConn)`. For dialing, we now only rely on `network.WithForceDirectDial` to force a direct connection. For new stream, we open a stream on a transient connection only if `network.WithUseTransient` is used.
sukunrt
force-pushed
the
sukun/dial-peer
branch
from
a29a92e
to
d8f93fc
Compare
marten-seemann
approved these changes
Sep 14, 2023
marten-seemann
approved these changes
Sep 16, 2023
sukunrt
added a commit
that referenced
this pull request
Oct 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a bug where the first call to
swarm.DialPeersucceeds and returns a transient connection with no error while the second call toswarm.DialPeerreturns(nil, network.ErrTransientConn).For dialing, we now only rely on
network.WithForceDirectDialto force a direct connection.For new stream, we open a stream on a transient connection only if
network.WithUseTransientis used.This feels correct to me since once we fix #1603 we can have
NewStreamcalled withoutnetwork.WithUseTransientornetwork.WithForceDirectDialand it'll wait for the transient connection to be upgraded to a direct connection before returning.I'm not fixing it the other way round, i.e. Failing if
network.WithUseTransientis not used, because there are users of this API who are probably relying on the first call to succeed. https://github.com/search?q=Network%28%29.DialPeer&type=code