fix: breaking change in 'warp' crate '0.4' from '0.3'

Author: jpraynaud

Cargo.lock

@@ -71,4 +71,4 @@ strum = { version = "0.27.2", features = ["derive"] }
 thiserror = "2.0.16"
 tokio = { version = "1.47.1", features = ["rt", "sync", "time"] }
 tracing = "0.1.41"
-warp = "0.4.2"
+warp = { version = "0.4.2", features = ["server", "websocket"] }

Cargo.toml

@@ -58,10 +58,11 @@ where
             .build()
             .expect("new rt");
         let (shutdown_tx, shutdown_rx) = oneshot::channel();
-        let (address, server) = rt.block_on(async move {
-            warp::serve(filters).bind_with_graceful_shutdown(socket_addr, async {
-                shutdown_rx.await.ok();
-            })
+        let listener =
+            rt.block_on(async move { tokio::net::TcpListener::bind(socket_addr).await.unwrap() });
+        let address = listener.local_addr().unwrap();
+        let server = warp::serve(filters).incoming(listener).graceful(async {
+            shutdown_rx.await.ok();
         });
 
         let (panic_tx, _) = std_mpsc::channel();
@@ -72,7 +73,7 @@ where
         thread::Builder::new()
             .name(thread_name)
             .spawn(move || {
-                rt.block_on(server);
+                rt.block_on(server.run());
                 let _ = panic_tx.send(());
             })
             .expect("thread spawn");

internal/tests/mithril-test-http-server/src/test_http_server.rs

@@ -88,6 +88,7 @@ mockall = { workspace = true }
 slog-scope = "4.4.0"
 slog-term = { workspace = true }
 tempfile = "3.21.0"
+warp = { workspace = true, features = ["test"] }
 
 [[bench]]
 name = "cardano_transactions_import"

mithril-aggregator/Cargo.toml

@@ -182,16 +182,17 @@ impl ServeCommand {
             .with_context(|| "Dependencies Builder can not create http routes")?;
         let mut stop_rx_clone = stop_rx.clone();
         join_set.spawn(async move {
-            let (_, server) = warp::serve(routes).bind_with_graceful_shutdown(
-                (
+            warp::serve(routes)
+                .bind((
                     config.server_ip.clone().parse::<IpAddr>().unwrap(),
                     config.server_port,
-                ),
-                async move {
+                ))
+                .await
+                .graceful(async move {
                     stop_rx_clone.changed().await.ok();
-                },
-            );
-            server.await;
+                })
+                .run()
+                .await;
 
             Ok(())
         });