Fix all rustls and openssl tests

programatik29 · Dec 22, 2023 · 0e5a427 · 0e5a427
1 parent 86f4294
commit 0e5a427
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/src/tls_openssl/mod.rs b/src/tls_openssl/mod.rs
@@ -325,16 +325,16 @@ mod tests {
         handle::Handle,
         tls_openssl::{self, OpenSSLConfig},
     };
-    use axum::{routing::get, Router};
+    use axum::body::Body;
+    use axum::routing::get;
+    use axum::Router;
     use bytes::Bytes;
     use http::{response, Request};
-    use hyper::{
-        client::conn::{handshake, SendRequest},
-        Body,
-    };
+    use http_body_util::BodyExt;
+    use hyper::client::conn::http1::{handshake, SendRequest};
+    use hyper_util::rt::TokioIo;
     use std::{io, net::SocketAddr, time::Duration};
     use tokio::{net::TcpStream, task::JoinHandle, time::timeout};
-    use tower::{Service, ServiceExt};
 
     use openssl::{
         ssl::{Ssl, SslConnector, SslMethod, SslVerifyMode},
@@ -415,12 +415,7 @@ mod tests {
 
         handle.shutdown();
 
-        let response_future_result = client
-            .ready()
-            .await
-            .unwrap()
-            .call(Request::new(Body::empty()))
-            .await;
+        let response_future_result = client.send_request(Request::new(Body::empty())).await;
 
         assert!(response_future_result.is_err());
 
@@ -512,7 +507,7 @@ mod tests {
 
     async fn connect(addr: SocketAddr) -> (SendRequest<Body>, JoinHandle<()>) {
         let stream = TcpStream::connect(addr).await.unwrap();
-        let tls_stream = tls_connector(dns_name(), stream).await;
+        let tls_stream = TokioIo::new(tls_connector(dns_name(), stream).await);
 
         let (send_request, connection) = handshake(tls_stream).await.unwrap();
 
@@ -525,14 +520,11 @@ mod tests {
 
     async fn send_empty_request(client: &mut SendRequest<Body>) -> (response::Parts, Bytes) {
         let (parts, body) = client
-            .ready()
-            .await
-            .unwrap()
-            .call(Request::new(Body::empty()))
+            .send_request(Request::new(Body::empty()))
             .await
             .unwrap()
             .into_parts();
-        let body = hyper::body::to_bytes(body).await.unwrap();
+        let body = body.collect().await.unwrap().to_bytes();
 
         (parts, body)
     }

diff --git a/src/tls_rustls/mod.rs b/src/tls_rustls/mod.rs
@@ -354,9 +354,9 @@ async fn config_from_pem_chain_file(
 mod tests {
     use crate::handle::Handle;
     use crate::tls_rustls::{self, RustlsConfig};
+    use axum::body::Body;
     use axum::routing::get;
     use axum::Router;
-    use axum::body::Body;
     use bytes::Bytes;
     use http::{response, Request};
     use http_body_util::BodyExt;
@@ -469,9 +469,7 @@ mod tests {
 
         handle.shutdown();
 
-        let response_future_result = client
-            .send_request(Request::new(Body::empty()))
-            .await;
+        let response_future_result = client.send_request(Request::new(Body::empty())).await;
 
         assert!(response_future_result.is_err());