Replace hyper with reqwest in tests

shotover · Feb 26, 2024 · 0b2ff58 · 0b2ff58
1 parent 0661bec
commit 0b2ff58
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -54,7 +54,6 @@ cql-ws = { git = "https://github.com/shotover/cql-ws" }
 opensearch = "2.1.0"
 serde_json = "1.0.103"
 time = { version = "0.3.25" }
-hyper.workspace = true
 shell-quote.workspace = true
 
 [features]

diff --git a/shotover-proxy/tests/transforms/tee.rs b/shotover-proxy/tests/transforms/tee.rs
@@ -1,5 +1,4 @@
 use crate::shotover_process;
-use hyper::{body, Body, Client, Method, Request, Response};
 use test_helpers::connection::redis_connection;
 use test_helpers::docker_compose::docker_compose;
 use test_helpers::shotover_process::{EventMatcher, Level};
@@ -205,23 +204,6 @@ async fn test_subchain_with_mismatch() {
     shotover.shutdown_and_then_consume_events(&[]).await;
 }
 
-async fn read_response_body(res: Response<Body>) -> Result<String, hyper::Error> {
-    let bytes = body::to_bytes(res.into_body()).await?;
-    Ok(String::from_utf8(bytes.to_vec()).expect("response was not valid utf-8"))
-}
-
-async fn hyper_request(uri: String, method: Method, body: Body) -> Response<Body> {
-    let client = Client::new();
-
-    let req = Request::builder()
-        .method(method)
-        .uri(uri)
-        .body(body)
-        .expect("request builder");
-
-    client.request(req).await.unwrap()
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn test_switch_main_chain() {
     let shotover = shotover_process("tests/test-configs/tee/switch_chain.yaml")
@@ -243,26 +225,11 @@ async fn test_switch_main_chain() {
 
         assert_eq!("a", result);
 
-        let _ = hyper_request(
-            format!(
-                "http://localhost:{}/transform/tee/result-source",
-                switch_port
-            ),
-            Method::PUT,
-            Body::from("tee-chain"),
-        )
-        .await;
+        let url = format!("http://localhost:{switch_port}/transform/tee/result-source");
+        let client = reqwest::Client::new();
+        client.put(&url).body("tee-chain").send().await.unwrap();
 
-        let res = hyper_request(
-            format!(
-                "http://localhost:{}/transform/tee/result-source",
-                switch_port
-            ),
-            Method::GET,
-            Body::empty(),
-        )
-        .await;
-        let body = read_response_body(res).await.unwrap();
+        let body = client.get(&url).send().await.unwrap().text().await.unwrap();
         assert_eq!("tee-chain", body);
 
         let result = redis::cmd("SET")
@@ -274,15 +241,7 @@ async fn test_switch_main_chain() {
 
         assert_eq!("b", result);
 
-        let _ = hyper_request(
-            format!(
-                "http://localhost:{}/transform/tee/result-source",
-                switch_port
-            ),
-            Method::PUT,
-            Body::from("regular-chain"),
-        )
-        .await;
+        client.put(&url).body("regular-chain").send().await.unwrap();
 
         let result = redis::cmd("SET")
             .arg("key")