Updated root Cargo.toml to latest hyper and http

- Broken build. Still more to go.

Cargo.toml

@@ -32,9 +32,11 @@ for_each_parallel = { path = "./lib/for_each_parallel" }
 futures = "0.3"
 futures-timer = "3"
 hdrhistogram = "7"
-http = "0.2"
-hyper = { version = "0.14", features = ["client", "http1", "http2", "stream"] }
-hyper-tls = "0.5"
+http = "1.1"
+hyper = { version = "1.0", features = ["client", "http1", "http2"] }
+hyper-tls = "0.6"
+hyper-util = { version = "0.1", features = ["tokio", "client", "http1", "http2"] }
+http-body-util = "0.1"
 itertools = "0.13"
 mod_interval = { path = "./lib/mod_interval" }
 native-tls = "0.2"
@@ -47,6 +49,7 @@ serde_json = "1"
 test_common = { path = "./lib/test_common" }
 tokio = "1"
 tokio-stream = { version = "0.1", features = ["sync", "time"] }
+tokio-util = "0.7"
 url = "2"
 yansi = "1"
 zip_all = { path = "./lib/zip_all" }

lib/config/Cargo.toml

@@ -12,7 +12,7 @@ doctest = false
 base64 = "0.22"
 ether = { path = "../either" }
 futures = "0.3"
-http = "0.2"
+http = "1.1"
 itertools = "0.13"
 jsonpath_lib = "0.3.0"
 percent-encoding = "2"

lib/test_common/Cargo.toml

@@ -13,8 +13,8 @@ path = "test_common.rs"
 bytes = "1"
 futures = "0.3"
 futures-timer = "3"
-hyper = { version = "1.4", features = ["http1"] }
-hyper-util = { version = "0.1", features = ["tokio", "server", "http1"] }
+hyper = { version = "1.4", features = ["http1", "http2"] }
+hyper-util = { version = "0.1", features = ["tokio", "server", "http1", "http2"] }
 http = "1.1"
 http-body-util = "0.1"
 parking_lot = "0.12"

src/lib.rs

@@ -26,8 +26,15 @@ use futures::{
     stream, FutureExt, Stream, StreamExt,
 };
 use futures_timer::Delay;
-use hyper::{client::HttpConnector, Body, Client};
+use hyper::body::Incoming as Body;
 use hyper_tls::HttpsConnector;
+use hyper_util::{
+    client::legacy::{
+        connect::{dns::GaiResolver, HttpConnector},
+        Client,
+    },
+    rt::TokioExecutor,
+};
 use itertools::Itertools;
 use line_writer::{blocking_writer, MsgType};
 use log::{debug, error, info, warn};
@@ -1139,16 +1146,15 @@ fn create_load_test_future(
 
 pub(crate) fn create_http_client(
     keepalive: Duration,
-) -> Result<
-    Client<HttpsConnector<HttpConnector<hyper::client::connect::dns::GaiResolver>>>,
-    TestError,
-> {
+) -> Result<Client<HttpsConnector<HttpConnector<GaiResolver>>, Body>, TestError> {
     let mut http = HttpConnector::new();
     http.set_keepalive(Some(keepalive));
     http.set_reuse_address(true);
     http.enforce_http(false);
     let https = HttpsConnector::from((http, TlsConnector::new()?.into()));
-    Ok(Client::builder().set_host(false).build::<_, Body>(https))
+    Ok(Client::builder(TokioExecutor::new())
+        .set_host(false)
+        .build::<_, Body>(https))
 }
 
 type ProvidersResult = Result<(BTreeMap<String, providers::Provider>, BTreeSet<String>), TestError>;