refactor(signer): Remove AggregatorClient::retrieve_aggregator_features

As it was supersed by the mithril network configuration and have now no
usage even in tests.

Author: Alenar

mithril-signer/src/services/aggregator_client.rs

@@ -1,11 +1,8 @@
 use async_trait::async_trait;
 
 use mithril_aggregator_client::AggregatorHttpClient;
-use mithril_aggregator_client::query::{GetAggregatorFeaturesQuery, GetEpochSettingsQuery};
-use mithril_common::{
-    StdResult,
-    messages::{AggregatorFeaturesMessage, TryFromMessageAdapter},
-};
+use mithril_aggregator_client::query::GetEpochSettingsQuery;
+use mithril_common::{StdResult, messages::TryFromMessageAdapter};
 
 use crate::entities::SignerEpochSettings;
 use crate::message_adapters::FromEpochSettingsAdapter;
@@ -16,9 +13,6 @@ use crate::message_adapters::FromEpochSettingsAdapter;
 pub trait AggregatorClient: Sync + Send {
     /// Retrieves epoch settings from the aggregator
     async fn retrieve_epoch_settings(&self) -> StdResult<Option<SignerEpochSettings>>;
-
-    /// Retrieves aggregator features message from the aggregator
-    async fn retrieve_aggregator_features(&self) -> StdResult<AggregatorFeaturesMessage>;
 }
 
 #[async_trait]
@@ -29,11 +23,6 @@ impl AggregatorClient for AggregatorHttpClient {
 
         Ok(Some(epoch_settings))
     }
-
-    async fn retrieve_aggregator_features(&self) -> StdResult<AggregatorFeaturesMessage> {
-        let aggregator_features = self.send(GetAggregatorFeaturesQuery::current()).await?;
-        Ok(aggregator_features)
-    }
 }
 
 #[cfg(test)]
@@ -48,14 +37,12 @@ pub(crate) mod dumb {
     /// It is driven by a Tester that controls the data it can return, and it can return its internal state for testing.
     pub struct DumbAggregatorClient {
         epoch_settings: RwLock<Option<SignerEpochSettings>>,
-        aggregator_features: RwLock<AggregatorFeaturesMessage>,
     }
 
     impl Default for DumbAggregatorClient {
         fn default() -> Self {
             Self {
                 epoch_settings: RwLock::new(Some(SignerEpochSettings::dummy())),
-                aggregator_features: RwLock::new(AggregatorFeaturesMessage::dummy()),
             }
         }
     }
@@ -67,10 +54,5 @@ pub(crate) mod dumb {
 
             Ok(epoch_settings)
         }
-
-        async fn retrieve_aggregator_features(&self) -> StdResult<AggregatorFeaturesMessage> {
-            let aggregator_features = self.aggregator_features.read().await;
-            Ok(aggregator_features.clone())
-        }
     }
 }

mithril-signer/tests/test_extensions/certificate_handler.rs

@@ -1,15 +1,10 @@
 use async_trait::async_trait;
-use std::collections::BTreeSet;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLock;
 
 use mithril_common::{
     StdResult,
-    entities::{
-        CardanoTransactionsSigningConfig, Epoch, ProtocolMessage, SignedEntityConfig,
-        SignedEntityType, SignedEntityTypeDiscriminants, Signer, SingleSignature, TimePoint,
-    },
-    messages::AggregatorFeaturesMessage,
+    entities::{Epoch, ProtocolMessage, SignedEntityType, Signer, SingleSignature, TimePoint},
     test::double::Dummy,
 };
 use mithril_ticker::{MithrilTickerService, TickerService};
@@ -18,19 +13,14 @@ use mithril_signer::services::{SignaturePublisher, SignerRegistrationPublisher};
 use mithril_signer::{entities::SignerEpochSettings, services::AggregatorClient};
 
 pub struct FakeAggregator {
-    signed_entity_config: RwLock<SignedEntityConfig>,
     registered_signers: RwLock<HashMap<Epoch, Vec<Signer>>>,
     ticker_service: Arc<MithrilTickerService>,
     withhold_epoch_settings: RwLock<bool>,
 }
 
 impl FakeAggregator {
-    pub fn new(
-        signed_entity_config: SignedEntityConfig,
-        ticker_service: Arc<MithrilTickerService>,
-    ) -> Self {
+    pub fn new(ticker_service: Arc<MithrilTickerService>) -> Self {
         Self {
-            signed_entity_config: RwLock::new(signed_entity_config),
             registered_signers: RwLock::new(HashMap::new()),
             ticker_service,
             withhold_epoch_settings: RwLock::new(true),
@@ -47,14 +37,6 @@ impl FakeAggregator {
         *settings = false;
     }
 
-    pub async fn change_allowed_discriminants(
-        &self,
-        discriminants: &BTreeSet<SignedEntityTypeDiscriminants>,
-    ) {
-        let mut signed_entity_config = self.signed_entity_config.write().await;
-        signed_entity_config.allowed_discriminants = discriminants.clone();
-    }
-
     async fn get_time_point(&self) -> StdResult<TimePoint> {
         let time_point = self.ticker_service.get_current_time_point().await?;
         Ok(time_point)
@@ -123,16 +105,6 @@ impl AggregatorClient for FakeAggregator {
             }))
         }
     }
-
-    async fn retrieve_aggregator_features(&self) -> StdResult<AggregatorFeaturesMessage> {
-        let signed_entity_config = self.signed_entity_config.read().await;
-
-        let mut message = AggregatorFeaturesMessage::dummy();
-        message.capabilities.signed_entity_types =
-            signed_entity_config.allowed_discriminants.clone();
-
-        Ok(message)
-    }
 }
 
 #[cfg(test)]
@@ -158,10 +130,7 @@ mod tests {
             immutable_observer.clone(),
         ));
 
-        (
-            chain_observer,
-            FakeAggregator::new(SignedEntityConfig::dummy(), ticker_service),
-        )
+        (chain_observer, FakeAggregator::new(ticker_service))
     }
 
     #[tokio::test]
@@ -249,35 +218,4 @@ mod tests {
         assert_eq!(2, epoch_settings.current_signers.len());
         assert_eq!(1, epoch_settings.next_signers.len());
     }
-
-    #[tokio::test]
-    async fn retrieve_aggregator_features() {
-        let (_chain_observer, fake_aggregator) = init().await;
-
-        {
-            let mut signing_config = fake_aggregator.signed_entity_config.write().await;
-            signing_config.allowed_discriminants = SignedEntityTypeDiscriminants::all();
-            signing_config.cardano_transactions_signing_config =
-                CardanoTransactionsSigningConfig::dummy();
-        }
-
-        let features = fake_aggregator.retrieve_aggregator_features().await.unwrap();
-        assert_eq!(
-            &SignedEntityTypeDiscriminants::all(),
-            &features.capabilities.signed_entity_types,
-        );
-
-        let new_discriminants = BTreeSet::from([
-            SignedEntityTypeDiscriminants::CardanoTransactions,
-            SignedEntityTypeDiscriminants::CardanoImmutableFilesFull,
-        ]);
-
-        fake_aggregator.change_allowed_discriminants(&new_discriminants).await;
-
-        let updated_features = fake_aggregator.retrieve_aggregator_features().await.unwrap();
-        assert_eq!(
-            &new_discriminants,
-            &updated_features.capabilities.signed_entity_types,
-        );
-    }
 }

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -34,9 +34,8 @@ use mithril_common::{
     api_version::APIVersionProvider,
     crypto_helper::{KesSigner, KesSignerStandard},
     entities::{
-        BlockNumber, CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityConfig,
-        SignedEntityType, SignedEntityTypeDiscriminants, SignerWithStake, SlotNumber, SupportedEra,
-        TimePoint,
+        BlockNumber, CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityType,
+        SignedEntityTypeDiscriminants, SignerWithStake, SlotNumber, SupportedEra, TimePoint,
     },
     signable_builder::{
         CardanoStakeDistributionSignableBuilder, CardanoTransactionsSignableBuilder,
@@ -167,13 +166,7 @@ impl StateMachineTester {
             security_parameter: BlockNumber(0),
             step: BlockNumber(30),
         };
-        let certificate_handler = Arc::new(FakeAggregator::new(
-            SignedEntityConfig {
-                allowed_discriminants: SignedEntityTypeDiscriminants::all(),
-                cardano_transactions_signing_config: cardano_transactions_signing_config.clone(),
-            },
-            ticker_service.clone(),
-        ));
+        let certificate_handler = Arc::new(FakeAggregator::new(ticker_service.clone()));
 
         let configuration_for_aggregation = MithrilNetworkConfigurationForEpoch {
             signed_entity_types_config: SignedEntityTypeConfiguration {