fix(testing/server): requests hanging

Author: binier

Cargo.lock

@@ -24,8 +24,8 @@ rand = "0.8"
 tokio = { version = "1.26.0" }
 num_cpus = "1.0"
 rayon = "1.5"
-axum = "0.6"
-tower-http = { version = "0.4.4", features = ["cors"] }
+axum = "0.7"
+tower-http = { version = "0.6", features = ["cors"] }
 strum = "0.26"
 strum_macros = "0.26"
 tracing-log = "0.2.0"

node/testing/Cargo.toml

@@ -66,7 +66,7 @@ impl Command {
 
         match self {
             Self::Server(args) => {
-                server(args.port);
+                server(rt, args.port);
                 Ok(())
             }
             Self::ScenariosGenerate(cmd) => {

node/testing/src/main.rs

@@ -13,10 +13,12 @@ use axum::{
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use serde::{Deserialize, Serialize};
+use tokio::net::TcpListener;
+use tokio::runtime::Runtime;
 use tokio::sync::{oneshot, Mutex, MutexGuard, OwnedMutexGuard};
 use tower_http::cors::CorsLayer;
 
-pub fn server(port: u16) {
+pub fn server(rt: Runtime, port: u16) {
     eprintln!("scenarios path: {}", Scenario::PATH);
 
     let state = AppState::new();
@@ -56,9 +58,10 @@ pub fn server(port: u16) {
         .with_state(state)
         .layer(cors);
 
-    tokio::runtime::Handle::current().block_on(async {
-        axum::Server::bind(&([0, 0, 0, 0], port).into())
-            .serve(app.into_make_service())
+    rt.block_on(async {
+        let addr = std::net::SocketAddr::from(([0, 0, 0, 0], port));
+        let listener = TcpListener::bind(addr).await.unwrap();
+        axum::serve(listener, app.into_make_service())
             .await
             .unwrap();
     });