[multistream-select] Fix panic with V1Lazy (regression) and more convenient transport boxing.
#1783
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
added 3 commits
October 5, 2020 11:01
Fixes a panic when using the `V1Lazy` negotiation protocol, a regression introduced in libp2p#1484. Thereby adds integration tests for a transport upgrade with both `V1` and `V1Lazy` to the `multistream-select` crate to prevent future regressions.
romanb
commented
Oct 5, 2020
| @@ -127,6 +127,7 @@ impl<TInner> Negotiated<TInner> { | |||
|
|
|||
| if let Message::Header(v) = &msg { | |||
| if *v == version { | |||
| *this.state = State::Expecting { io, protocol, version }; | |||
There was a problem hiding this comment.
This is the patch for the regression, where this line got removed.
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.
Fixes a panic when using the
V1Lazynegotiation protocol, a regression introduced in 1484(Upgrade to stable futures). Thereby adds integration tests for a transport upgrade with bothV1andV1Lazyto themultistream-selectcrate to prevent future regressions.As a small refactoring on the side, I changed
Transport::boxedto always also box theStreamMuxerand the transport errors, as this is how boxed transport are pretty much always used. I don't think it is necessary to support boxing of a transport at various levels of granularity. Now, when you want a boxed transport you just need to tack on.boxed()at the end of the transport builder and get a boxed transport with a boxed stream muxer and boxed transport errors, i.e. a simple boxed type for the whole transport.