jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: change RpcServer build (#1367)

Browse Source
This commit is contained in:
Matthias Seitz
2023-02-15 11:19:26 +01:00
committed by GitHub
parent 7480ea418b
commit a4ad2da06e
2 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crates/rpc/rpc-builder/src/lib.rs
View File

@ -527,53 +527,39 @@ impl RpcServerConfig {
///
/// Note: The server ist not started and does nothing unless polled, See also [RpcServer::start]
pub async fn build(self) -> Result<RpcServer, RpcError> {
let mut server = RpcServer::empty();
let http_socket_addr = self.http_addr.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
Ipv4Addr::UNSPECIFIED,
DEFAULT_HTTP_RPC_PORT,
)));
let mut http_local_addr = None;
let http_server = if let Some(builder) = self.http_server_config {
let server = builder.build(http_socket_addr).await?;
http_local_addr = server.local_addr().ok();
Some(server)
} else {
None
};
if let Some(builder) = self.http_server_config {
let http_server = builder.build(http_socket_addr).await?;
server.http_local_addr = http_server.local_addr().ok();
server.http = Some(http_server);
}
let ws_socket_addr = self.ws_addr.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
Ipv4Addr::UNSPECIFIED,
DEFAULT_WS_RPC_PORT,
)));
let mut ws_local_addr = None;
if let Some(builder) = self.ws_server_config {
let ws_server = builder.build(ws_socket_addr).await.unwrap();
server.ws_local_addr = ws_server.local_addr().ok();
server.ws = Some(ws_server);
}
let ws_server = if let Some(builder) = self.ws_server_config {
let server = builder.build(ws_socket_addr).await.unwrap();
ws_local_addr = server.local_addr().ok();
Some(server)
} else {
None
};
let ipc_server = if let Some(builder) = self.ipc_server_config {
if let Some(builder) = self.ipc_server_config {
let ipc_path = self
.ipc_endpoint
.unwrap_or_else(|| Endpoint::new(DEFAULT_IPC_ENDPOINT.to_string()));
let server = builder.build(ipc_path.path())?;
Some(server)
} else {
None
};
let ipc = builder.build(ipc_path.path())?;
server.ipc = Some(ipc);
}
Ok(RpcServer {
http_local_addr,
ws_local_addr,
http: http_server,
ws: ws_server,
ipc: ipc_server,
})
Ok(server)
}
}
@ -677,6 +663,10 @@ pub struct RpcServer {
// === impl RpcServer ===
impl RpcServer {
fn empty() -> RpcServer {
RpcServer { http_local_addr: None, ws_local_addr: None, http: None, ws: None, ipc: None }
}
/// Returns the [`SocketAddr`] of the http server if started.
fn http_local_addr(&self) -> Option<SocketAddr> {
self.http_local_addr

2
crates/rpc/rpc-builder/tests/it/http.rs
View File

@ -28,7 +28,7 @@ fn is_unimplemented(err: Error) -> bool {
error_obj.code() == ErrorCode::InternalError.code() &&
error_obj.message() == "unimplemented"
}
_ => return false,
_ => false,
}
}