Merge pull request #2847 from input-output-hk/djo/2827/refactor-client-lib-to-use-shared-aggregator-client

refactor(mithril-client-library): switch http backend to new shared `mithril-aggregator-client`

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator-client"
-version = "0.1.5"
+version = "0.1.6"
 description = "Client to request data from a Mithril Aggregator"
 authors.workspace = true
 documentation.workspace = true

internal/mithril-aggregator-client/Cargo.toml

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use reqwest::{Client, IntoUrl, Proxy, Url};
+use reqwest::{Client, IntoUrl, Url};
 use slog::{Logger, o};
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -16,6 +16,7 @@ pub struct AggregatorClientBuilder {
     api_version_provider: Option<Arc<APIVersionProvider>>,
     additional_headers: Option<HashMap<String, String>>,
     timeout_duration: Option<Duration>,
+    #[cfg(not(target_family = "wasm"))]
     relay_endpoint: Option<String>,
     logger: Option<Logger>,
 }
@@ -30,6 +31,7 @@ impl AggregatorClientBuilder {
             api_version_provider: None,
             additional_headers: None,
             timeout_duration: None,
+            #[cfg(not(target_family = "wasm"))]
             relay_endpoint: None,
             logger: None,
         }
@@ -63,6 +65,9 @@ impl AggregatorClientBuilder {
     }
 
     /// Set the address of the relay
+    ///
+    /// _Not available on wasm platforms_
+    #[cfg(not(target_family = "wasm"))]
     pub fn with_relay_endpoint(mut self, relay_endpoint: Option<String>) -> Self {
         self.relay_endpoint = relay_endpoint;
         self
@@ -77,9 +82,15 @@ impl AggregatorClientBuilder {
         let logger = self.logger.unwrap_or_else(|| Logger::root(slog::Discard, o!()));
         let api_version_provider = self.api_version_provider.unwrap_or_default();
         let additional_headers = self.additional_headers.unwrap_or_default();
+        #[cfg(not(target_family = "wasm"))]
         let mut client_builder = Client::builder();
+        #[cfg(target_family = "wasm")]
+        let client_builder = Client::builder();
 
+        #[cfg(not(target_family = "wasm"))]
         if let Some(relay_endpoint) = self.relay_endpoint {
+            use reqwest::Proxy;
+
             client_builder = client_builder
                 .proxy(Proxy::all(relay_endpoint).with_context(|| "Relay proxy creation failed")?)
         }

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

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client"
-version = "0.12.37"
+version = "0.13.0"
 description = "Mithril client library"
 authors = { workspace = true }
 edition = { workspace = true }
@@ -52,20 +52,19 @@ num-integer-backend = ["mithril-common/num-integer-backend"]
 
 [dependencies]
 anyhow = { workspace = true }
-async-recursion = { workspace = true }
 async-trait = { workspace = true }
 chrono = { workspace = true }
 flate2 = { version = "1.1.4", optional = true }
 flume = { version = "0.11.1", optional = true }
 futures = "0.3.31"
+mithril-aggregator-client = { path = "../internal/mithril-aggregator-client", version = ">=0.1.4" }
 mithril-common = { path = "../mithril-common", version = ">=0.6", default-features = false }
 reqwest = { workspace = true, default-features = false, features = [
     "charset",
     "http2",
     "macos-system-configuration",
     "stream",
 ] }
-semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 slog = { workspace = true }