refactor: transfert http compression features to the aggregator client crate

Not enabled by default on the crate, but enabled in the signer and the
aggregator (to keep existing behavior)

+ add a test to check that the compression is enabled in signer,
  aggregator, and aggregator-client (for the later only if the http
  compression feature is enabled)
+ signer: simplify dependencies following shared aggregator client usage

Author: Alenar

Cargo.lock

@@ -13,6 +13,12 @@ include = ["**/*.rs", "Cargo.toml", "README.md"]
 [lib]
 crate-type = ["lib", "cdylib", "staticlib"]
 
+[features]
+default = []
+
+# Support compressed traffic with `reqwest`
+enable-http-compression = ["reqwest/gzip", "reqwest/zstd", "reqwest/deflate", "reqwest/brotli"]
+
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }

internal/mithril-aggregator-client/Cargo.toml

@@ -205,6 +205,9 @@ mod tests {
         }
     }
 
+    #[cfg(feature = "enable-http-compression")]
+    crate::test_http_compression_is_enabled!();
+
     #[tokio::test]
     async fn test_minimal_get_query() {
         let (server, client) = setup_server_and_client();

internal/mithril-aggregator-client/src/client.rs

@@ -7,7 +7,6 @@ mod client;
 mod error;
 mod external_trait_impls;
 pub mod query;
-#[cfg(test)]
 mod test;
 
 pub use builder::AggregatorClientBuilder;

internal/mithril-aggregator-client/src/lib.rs

@@ -1,5 +1,7 @@
+#[cfg(test)]
 use httpmock::MockServer;
 
+#[cfg(test)]
 use crate::AggregatorHttpClient;
 
 #[cfg(test)]
@@ -29,3 +31,36 @@ macro_rules! assert_error_matches {
 }
 #[cfg(test)]
 pub(crate) use assert_error_matches;
+
+/// Define a test that checks that http compression is enabled for the client.
+///
+/// Requires `httpmock` in dev-dependencies
+#[macro_export]
+macro_rules! test_http_compression_is_enabled {
+    () => {
+        #[tokio::test]
+        async fn test_http_compression_is_enabled_and_send_accept_encoding_header_with_correct_values() {
+            let server = httpmock::MockServer::start();
+            server.mock(|when, then| {
+                when.is_true(|req| {
+                    let headers = req.headers();
+                    let accept_encoding_header = headers
+                        .get("accept-encoding")
+                        .expect("Accept-Encoding header not found");
+
+                    ["gzip", "br", "deflate", "zstd"].iter().all(|&encoding| {
+                        accept_encoding_header.to_str().is_ok_and(|h| h.contains(encoding))
+                    })
+                });
+
+                then.status(200).body("[]");
+            });
+
+            let client = $crate::AggregatorHttpClient::builder(server.base_url()).build().unwrap();
+            client
+                .send($crate::query::GetCertificatesListQuery::latest())
+                .await
+                .expect("GET request should succeed with Accept-Encoding header");
+        }
+    };
+}

internal/mithril-aggregator-client/src/test/mod.rs

@@ -26,7 +26,7 @@ flate2 = "1.1.4"
 gcloud-kms = { version = "1.3.1", features = ["auth"] }
 gcloud-storage = { version = "1.1.1", features = ["auth"] }
 hex = { workspace = true }
-mithril-aggregator-client = { path = "../internal/mithril-aggregator-client" }
+mithril-aggregator-client = { path = "../internal/mithril-aggregator-client", features = ["enable-http-compression"] }
 mithril-cardano-node-chain = { path = "../internal/cardano-node/mithril-cardano-node-chain" }
 mithril-cardano-node-internal-database = { path = "../internal/cardano-node/mithril-cardano-node-internal-database" }
 mithril-cli-helper = { path = "../internal/mithril-cli-helper" }
@@ -44,13 +44,7 @@ paste = "1.0.15"
 percent-encoding = "2.3.2"
 rayon = { workspace = true }
 regex = "1.12.2"
-reqwest = { workspace = true, features = [
-    "default",
-    "gzip",
-    "zstd",
-    "deflate",
-    "brotli"
-] }
+reqwest = { workspace = true, features = ["default"] }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -69,3 +69,8 @@ use tikv_jemallocator::Jemalloc;
 #[cfg(all(not(target_env = "msvc"), feature = "jemallocator"))]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
+
+#[cfg(test)]
+mod tests {
+    mithril_aggregator_client::test_http_compression_is_enabled!();
+}

mithril-aggregator/src/lib.rs

@@ -9,6 +9,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
 
+[package.metadata.cargo-machete]
+# reqwest re-enables default features (HTTP/2, TLS) that are disabled in workspace
+ignored = ["reqwest"]
+
 [features]
 default = ["jemallocator"]
 
@@ -23,7 +27,7 @@ chrono = { workspace = true }
 clap = { workspace = true }
 config = { workspace = true }
 hex = { workspace = true }
-mithril-aggregator-client = { path = "../internal/mithril-aggregator-client" }
+mithril-aggregator-client = { path = "../internal/mithril-aggregator-client", features = ["enable-http-compression"] }
 mithril-cardano-node-chain = { path = "../internal/cardano-node/mithril-cardano-node-chain" }
 mithril-cardano-node-internal-database = { path = "../internal/cardano-node/mithril-cardano-node-internal-database" }
 mithril-cli-helper = { path = "../internal/mithril-cli-helper" }
@@ -38,15 +42,7 @@ mithril-signed-entity-lock = { path = "../internal/signed-entity/mithril-signed-
 mithril-signed-entity-preloader = { path = "../internal/signed-entity/mithril-signed-entity-preloader" }
 mithril-ticker = { path = "../internal/mithril-ticker" }
 rand_core = { workspace = true }
-reqwest = { workspace = true, features = [
-    "default",
-    "stream",
-    "gzip",
-    "zstd",
-    "deflate",
-    "brotli"
-] }
-semver = { workspace = true }
+reqwest = { workspace = true, features = ["default"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 slog = { workspace = true, features = [
@@ -64,7 +60,6 @@ tikv-jemallocator = { version = "0.6.0", optional = true }
 
 [dev-dependencies]
 criterion = { version = "0.7.0", features = ["html_reports", "async_tokio"] }
-http = "1.3.1"
 httpmock = "0.8.1"
 mockall = { workspace = true }
 prometheus-parse = "0.2.5"

mithril-signer/Cargo.toml

@@ -43,3 +43,8 @@ static GLOBAL: Jemalloc = Jemalloc;
 pub(crate) mod test_tools {
     mithril_common::define_test_logger!();
 }
+
+#[cfg(test)]
+mod tests {
+    mithril_aggregator_client::test_http_compression_is_enabled!();
+}