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.

Sign up for GitHub

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

refactor(rpc): remove intermediate types from rpc start up process #9180

Merged
merged 12 commits into from
Jul 8, 2024
Merged

refactor(rpc): remove intermediate types from rpc start up process #9180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f841384
remove intermediary types, update effected tests, add ipc start
smatthewenglish Jul 8, 2024
b5b129b
Update crates/rpc/rpc-builder/src/lib.rs
smatthewenglish Jul 8, 2024
811917f
fix according to review feedback
smatthewenglish Jul 8, 2024
dfe8ca7
update
smatthewenglish Jul 8, 2024
f90f1a2
update
smatthewenglish Jul 8, 2024
f881558
update
smatthewenglish Jul 8, 2024
e221c8f
update
smatthewenglish Jul 8, 2024
261a3f5
format
smatthewenglish Jul 8, 2024
2773aee
update
smatthewenglish Jul 8, 2024
10197f9
update
smatthewenglish Jul 8, 2024
fe27719
update
smatthewenglish Jul 8, 2024
3e577fb
docs: touchups
mattsse Jul 8, 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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,4 +535,4 @@ proptest-derive = "0.5"
serial_test = "3"
similar-asserts = "1.5.0"
test-fuzz = "5"
iai-callgrind = "0.11"
iai-callgrind = "0.11.1"
29 changes: 14 additions & 15 deletions crates/node/builder/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,19 +288,19 @@ where

extend_rpc_modules.extend_rpc_modules(ctx)?;

let server_config = config.rpc.rpc_server_config();
let launch_rpc = modules.clone().start_server(server_config).map_ok(|handle| {
if let Some(path) = handle.ipc_endpoint() {
info!(target: "reth::cli", %path, "RPC IPC server started");
}
if let Some(addr) = handle.http_local_addr() {
info!(target: "reth::cli", url=%addr, "RPC HTTP server started");
}
if let Some(addr) = handle.ws_local_addr() {
info!(target: "reth::cli", url=%addr, "RPC WS server started");
}
handle
});
let mut server_config = config.rpc.rpc_server_config();
let cloned_modules = modules.clone();
let launch_rpc = server_config.start(&cloned_modules).await?;

if let Some(path) = launch_rpc.ipc_endpoint() {
info!(target: "reth::cli", %path, "RPC IPC server started");
}
if let Some(addr) = launch_rpc.http_local_addr() {
info!(target: "reth::cli", url=%addr, "RPC HTTP server started");
}
if let Some(addr) = launch_rpc.ws_local_addr() {
info!(target: "reth::cli", url=%addr, "RPC WS server started");
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can keep doing .map_ok and

let (rpc, auth) = futures::future::try_join(launch_rpc, launch_auth).await?;

so we can start the servers concurrently


let launch_auth = auth_module.clone().start_server(auth_config).map_ok(|handle| {
let addr = handle.local_addr();
Expand All @@ -313,8 +313,7 @@ where
});

// launch servers concurrently
let (rpc, auth) = futures::future::try_join(launch_rpc, launch_auth).await?;
let handles = RethRpcServerHandles { rpc, auth };
let handles = RethRpcServerHandles { rpc: launch_rpc, auth: launch_auth.await? };

let ctx = RpcContext {
node,
Expand Down
Loading
Loading