-
Notifications
You must be signed in to change notification settings - Fork 170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
upgrade to hyper v1.0 #1368
Merged
Merged
upgrade to hyper v1.0 #1368
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
93c7dc2
upgrade to hyper v1.0
niklasad1 38bcfd4
some progress
niklasad1 5ffd811
fix nits
niklasad1 e764e33
Merge remote-tracking branch 'origin/master' into na-hyper-v1.0
niklasad1 4a61aed
more cleanup
niklasad1 58b725c
Update client/http-client/Cargo.toml
niklasad1 efc92be
make all examples compile
niklasad1 103add0
remove nits
niklasad1 0d9be00
unify http request
niklasad1 3232128
introduce BoxError
niklasad1 642d964
more boxerror
niklasad1 1af0511
fix tests
niklasad1 8c6a5ea
remove sync requirement
niklasad1 0fe58e2
fix nits
niklasad1 b8d1295
use ring crypto backend
niklasad1 4ff7805
more ring
niklasad1 d357e1d
Update client/ws-client/src/tests.rs
niklasad1 abc94bd
Update client/http-client/src/transport.rs
niklasad1 ec9f320
Update server/src/middleware/http/proxy_get_request.rs
niklasad1 1e7bc49
Update server/src/transport/ws.rs
niklasad1 ae860bd
simplify code
niklasad1 0e79167
address grumbles
niklasad1 bb3dbd5
unify http body in client/server
niklasad1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -461,6 +461,8 @@ fn assert_error_response(err: Error, exp: ErrorObjectOwned) { | |
|
||
#[tokio::test] | ||
async fn redirections() { | ||
init_logger(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: is this indended? |
||
|
||
let expected = "abc 123"; | ||
let server = WebSocketTestServer::with_hardcoded_response( | ||
"127.0.0.1:0".parse().unwrap(), | ||
|
@@ -471,7 +473,8 @@ async fn redirections() { | |
.unwrap(); | ||
|
||
let server_url = format!("ws://{}", server.local_addr()); | ||
let redirect_url = jsonrpsee_test_utils::mocks::ws_server_with_redirect(server_url); | ||
let redirect_url = | ||
jsonrpsee_test_utils::mocks::ws_server_with_redirect(server_url).with_default_timeout().await.unwrap(); | ||
|
||
// The client will first connect to a server that only performs re-directions and finally | ||
// redirect to another server to complete the handshake. | ||
|
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's discuss whether we should support both crypto backends.
Rustls now supports both ring and aws-lc-rs but migrating to aws-lc-rs requires more dependencies such as cmake, NASM etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm happy with not exposing it initially, and then as a non-breaking change we can always expose it later or whatever if there's demand :)