chore(client): update capabilities to required capabilities

Author: jpraynaud

internal/mithril-aggregator-discovery/src/capabilities_discoverer.rs

@@ -87,17 +87,17 @@ impl Iterator for CapableAggregatorDiscovererIterator {
     type Item = AggregatorEndpoint;
 
     fn next(&mut self) -> Option<Self::Item> {
-        while let Some(aggregator_endpoint) = self.inner_iterator.next() {
+        for aggregator_endpoint in self.inner_iterator.by_ref() {
             let aggregator_endpoint_clone = aggregator_endpoint.clone();
             let aggregator_capabilities = tokio::task::block_in_place(move || {
                 tokio::runtime::Handle::current().block_on(async move {
                     aggregator_endpoint_clone.retrieve_capabilities().await
                 })
             });
-            if let Ok(aggregator_capabilities) = aggregator_capabilities {
-                if self.required_capabilities.matches(&aggregator_capabilities) {
-                    return Some(aggregator_endpoint);
-                }
+            if let Ok(aggregator_capabilities) = aggregator_capabilities
+                && self.required_capabilities.matches(&aggregator_capabilities)
+            {
+                return Some(aggregator_endpoint);
             }
         }
 

mithril-client/src/client.rs

@@ -10,10 +10,9 @@ use std::sync::Arc;
 
 use mithril_aggregator_discovery::{
     AggregatorDiscoverer, CapableAggregatorDiscoverer, HttpConfigAggregatorDiscoverer,
-    MithrilNetwork,
+    MithrilNetwork, RequiredAggregatorCapabilities,
 };
 use mithril_common::api_version::APIVersionProvider;
-use mithril_common::messages::AggregatorCapabilities;
 use mithril_common::{MITHRIL_CLIENT_TYPE_HEADER, MITHRIL_ORIGIN_TAG_HEADER};
 
 use crate::MithrilResult;
@@ -179,7 +178,7 @@ impl Client {
 /// Builder than can be used to create a [Client] easily or with custom dependencies.
 pub struct ClientBuilder {
     aggregator_discovery: AggregatorDiscoveryType,
-    aggregator_capabilities: Option<AggregatorCapabilities>,
+    aggregator_capabilities: Option<RequiredAggregatorCapabilities>,
     aggregator_discoverer: Option<Arc<dyn AggregatorDiscoverer>>,
     genesis_verification_key: Option<GenesisVerificationKey>,
     origin_tag: Option<String>,
@@ -207,6 +206,18 @@ impl ClientBuilder {
         )
     }
 
+    /// Constructs a new `ClientBuilder` that automatically discovers the aggregator for the given
+    /// Mithril network and with the given genesis verification key.
+    pub fn automatic(network: &str, genesis_verification_key: &str) -> ClientBuilder {
+        Self::new(AggregatorDiscoveryType::Automatic(MithrilNetwork::new(
+            network.to_string(),
+        )))
+        .with_genesis_verification_key(GenesisVerificationKey::JsonHex(
+            genesis_verification_key.to_string(),
+        ))
+        .with_default_aggregator_discoverer()
+    }
+
     /// Constructs a new `ClientBuilder` without any dependency set.
     pub fn new(aggregator_discovery: AggregatorDiscoveryType) -> ClientBuilder {
         Self {
@@ -242,7 +253,10 @@ impl ClientBuilder {
     }
 
     /// Sets the aggregator capabilities expected to be matched by the aggregator with which the client will interact.
-    pub fn with_capabilities(mut self, capabilities: AggregatorCapabilities) -> ClientBuilder {
+    pub fn with_capabilities(
+        mut self,
+        capabilities: RequiredAggregatorCapabilities,
+    ) -> ClientBuilder {
         self.aggregator_capabilities = Some(capabilities);
 
         self