refactor rpc test setup and fix clippy

nervosnetwork · Oct 26, 2023 · bdb9335 · bdb9335
1 parent be5bee0
commit bdb9335
Show file tree

Hide file tree

Showing 4 changed files with 328 additions and 318 deletions.
diff --git a/rpc/src/server.rs b/rpc/src/server.rs
@@ -39,26 +39,26 @@ impl RpcServer {
 
         let http_address = Self::start_server(&rpc, config.listen_address.to_owned())
             .await
-            .and_then(|addr| {
-                info!("Listen HTTP RPCServer on address: {}", addr);
-                Ok(addr)
+            .map(|local_addr| {
+                info!("Listen HTTP RPCServer on address: {}", local_addr);
+                local_addr
             })
             .unwrap();
 
         let ws_address = if let Some(addr) = config.ws_listen_address {
-            let r = Self::start_server(&rpc, addr).await.and_then(|addr| {
+            let local_addr = Self::start_server(&rpc, addr).await.map(|addr| {
                 info!("Listen WebSocket RPCServer on address: {}", addr);
-                Ok(addr)
+                addr
             });
-            r.ok()
+            local_addr.ok()
         } else {
             None
         };
 
         let tcp_address = if let Some(addr) = config.tcp_listen_address {
-            let local_addr = Self::start_tcp_server(rpc, addr).await.and_then(|addr| {
+            let local_addr = Self::start_tcp_server(rpc, addr).await.map(|addr| {
                 info!("Listen TCP RPCServer on address: {}", addr);
-                Ok(addr)
+                addr
             });
             local_addr.ok()
         } else {