Skip to content
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

rpc: bump jsonrpsee v0.22 and fix race in rpc v2 chain_head #3230

Merged
merged 30 commits into from
Feb 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3f7e94b
jsonrpsee v0.22
niklasad1 Feb 6, 2024
250f109
fix race in chainhead
niklasad1 Feb 6, 2024
8bc7fd7
fix some nits
niklasad1 Feb 6, 2024
b0769b7
fix bad Cargo.toml fmt
niklasad1 Feb 6, 2024
3d16db8
make test compile
niklasad1 Feb 6, 2024
a7032d9
fix tests
niklasad1 Feb 7, 2024
be5052a
jsonrpsee v0.22
niklasad1 Feb 7, 2024
6326b34
fix more nits
niklasad1 Feb 7, 2024
dc856ac
Merge remote-tracking branch 'origin/master' into na-bump-jsonrpsee-v…
niklasad1 Feb 7, 2024
6d088e1
Update cumulus/client/relay-chain-interface/Cargo.toml
niklasad1 Feb 7, 2024
b77a992
update Cargo.lock
niklasad1 Feb 7, 2024
4802cc4
fix rustdocs
niklasad1 Feb 7, 2024
485393f
remove needless box
niklasad1 Feb 8, 2024
bdc42f6
address grumbles
niklasad1 Feb 8, 2024
8bf3636
Update substrate/client/rpc-servers/src/lib.rs
niklasad1 Feb 8, 2024
3a78c54
clarify breaking ws pings
niklasad1 Feb 8, 2024
118480d
fix nits
niklasad1 Feb 8, 2024
104dc2d
Merge remote-tracking branch 'origin/master' into na-bump-jsonrpsee-v…
niklasad1 Feb 9, 2024
91437e9
Merge remote-tracking branch 'origin/master' into na-bump-jsonrpsee-v…
niklasad1 Feb 14, 2024
6d96bd6
add prdoc
niklasad1 Feb 14, 2024
467f11b
improve prdoc
niklasad1 Feb 14, 2024
8a9e5c7
fix prdoc
niklasad1 Feb 14, 2024
1ad6d28
fix bad merge
niklasad1 Feb 14, 2024
1a61781
Update prdoc/pr_3230.prdoc
niklasad1 Feb 14, 2024
5936168
Update prdoc/pr_3230.prdoc
niklasad1 Feb 14, 2024
70b98a2
Update prdoc/pr_3230.prdoc
niklasad1 Feb 14, 2024
18b636e
improve subscription drop log
niklasad1 Feb 14, 2024
25a5320
Merge remote-tracking branch 'origin/na-bump-jsonrpsee-v0.22' into na…
niklasad1 Feb 14, 2024
5f892f2
Merge branch 'master' into na-bump-jsonrpsee-v0.22
niklasad1 Feb 14, 2024
0cbd07a
fix merge nits
niklasad1 Feb 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove needless box
  • Loading branch information
niklasad1 committed Feb 8, 2024
commit 485393ff43b9a11a665b5bd1f074427abdfaa50d
10 changes: 3 additions & 7 deletions substrate/client/rpc-servers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ pub mod middleware;

use std::{convert::Infallible, error::Error as StdError, net::SocketAddr, time::Duration};

use futures::FutureExt;
use http::header::HeaderValue;
use hyper::{
server::conn::AddrStream,
Expand Down Expand Up @@ -168,13 +167,10 @@ pub async fn start_server<M: Send + Sync + 'static>(
on_disconnect.await;
metrics.as_ref().map(|m| m.ws_disconnect(now));
});

svc.call(req).await
} else {
svc.call(req).await
}

svc.call(req).await
}
.boxed()
}))
}
});
Expand All @@ -183,7 +179,7 @@ pub async fn start_server<M: Send + Sync + 'static>(

tokio::spawn(async move {
let graceful = server.with_graceful_shutdown(async move { stop_handle.shutdown().await });
graceful.await.unwrap()
let _ = graceful.await;
});

log::info!(
Expand Down
Loading