companion for #13384

node/test/service/src/lib.rs

@@ -190,18 +190,14 @@ pub fn node_config(
 			offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
 			other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
 		},
-		rpc_http: None,
-		rpc_ws: None,
-		rpc_ipc: None,
-		rpc_max_payload: None,
+		rpc_addr: None,
 		rpc_max_request_size: None,
 		rpc_max_response_size: None,
-		rpc_ws_max_connections: None,
+		rpc_max_connections: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_id_provider: None,
 		rpc_max_subs_per_conn: None,
-		ws_max_out_buffer_capacity: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		default_heap_pages: None,

tests/common.rs

@@ -89,15 +89,13 @@ pub fn find_ws_url_from_output(read: impl Read + Send) -> (String, String) {
 			data.push_str(&line);
 
 			// does the line contain our port (we expect this specific output from substrate).
-			let sock_addr = match line.split_once("Running JSON-RPC WS server: addr=") {
+			let sock_addr = match line.split_once("Running JSON-RPC server: addr=") {
 				None => return None,
 				Some((_, after)) => after.split_once(',').unwrap().0,
 			};
 
 			Some(format!("ws://{}", sock_addr))
 		})
-		.unwrap_or_else(|| {
-			panic!("Could not find WebSocket address in process output:\n{}", &data)
-		});
+		.unwrap_or_else(|| panic!("Could not find address in process output:\n{}", &data));
 	(ws_url, data)
 }