refactor(protocol-config, signer): rename ProtocolConfigurationRetriever to ProtocolConfigurationRetrieverFromAggregator

Author: turmelclem

internal/mithril-protocol-config/src/http_client/http_impl.rs

@@ -14,7 +14,7 @@ use crate::model::{MithrilNetworkConfiguration, MithrilNetworkConfigurationForEp
 /// Trait to retrieve protocol configuration
 #[cfg_attr(test, mockall::automock)]
 #[async_trait]
-pub trait ProtocolConfigurationRetriever: Sync + Send {
+pub trait ProtocolConfigurationRetrieverFromAggregator: Sync + Send {
     /// Retrieves protocol configuration for a given epoch from the aggregator
     async fn retrieve_protocol_configuration(
         &self,
@@ -24,12 +24,14 @@ pub trait ProtocolConfigurationRetriever: Sync + Send {
 
 /// Structure implementing MithrilNetworkConfigurationProvider using HTTP.
 pub struct HttpMithrilNetworkConfigurationProvider {
-    protocol_configuration_retriever: Arc<dyn ProtocolConfigurationRetriever>,
+    protocol_configuration_retriever: Arc<dyn ProtocolConfigurationRetrieverFromAggregator>,
 }
 
 impl HttpMithrilNetworkConfigurationProvider {
     /// HttpMithrilNetworkConfigurationProvider factory
-    pub fn new(protocol_configuration_retriever: Arc<dyn ProtocolConfigurationRetriever>) -> Self {
+    pub fn new(
+        protocol_configuration_retriever: Arc<dyn ProtocolConfigurationRetrieverFromAggregator>,
+    ) -> Self {
         Self {
             protocol_configuration_retriever,
         }
@@ -94,15 +96,17 @@ mod tests {
 
     use crate::{
         http_client::http_impl::{
-            HttpMithrilNetworkConfigurationProvider, MockProtocolConfigurationRetriever,
+            HttpMithrilNetworkConfigurationProvider,
+            MockProtocolConfigurationRetrieverFromAggregator,
         },
         interface::MithrilNetworkConfigurationProvider,
     };
 
     #[tokio::test]
     async fn test_get_network_configuration_retrieve_configurations_for_aggregation_next_aggregation_and_registration()
      {
-        let mut protocol_configuration_retriever = MockProtocolConfigurationRetriever::new();
+        let mut protocol_configuration_retriever =
+            MockProtocolConfigurationRetrieverFromAggregator::new();
 
         protocol_configuration_retriever
             .expect_retrieve_protocol_configuration()

internal/mithril-protocol-config/src/test/double/configuration_provider.rs

@@ -4,7 +4,7 @@ use tokio::sync::RwLock;
 
 use crate::{
     interface::MithrilNetworkConfigurationProvider,
-    model::{MithrilNetworkConfigurationForEpoch, MithrilNetworkConfiguration},
+    model::{MithrilNetworkConfiguration, MithrilNetworkConfigurationForEpoch},
 };
 use async_trait::async_trait;
 use mithril_common::{StdResult, entities::Epoch};
@@ -36,7 +36,10 @@ impl FakeMithrilNetworkConfigurationProvider {
     }
 
     ///Change the configuration of the aggregation
-    pub async fn change_aggregation_configuration(&self, conf: MithrilNetworkConfigurationForEpoch) {
+    pub async fn change_aggregation_configuration(
+        &self,
+        conf: MithrilNetworkConfigurationForEpoch,
+    ) {
         let mut configuration_for_aggregation = self.configuration_for_aggregation.write().await;
         *configuration_for_aggregation = conf;
     }

internal/mithril-protocol-config/src/test/double/dummies.rs

@@ -6,7 +6,7 @@ use mithril_common::{
 };
 
 use crate::model::{
-    MithrilNetworkConfigurationForEpoch, MithrilNetworkConfiguration, SignedEntityTypeConfiguration,
+    MithrilNetworkConfiguration, MithrilNetworkConfigurationForEpoch, SignedEntityTypeConfiguration,
 };
 
 impl Dummy for MithrilNetworkConfiguration {

mithril-signer/src/services/aggregator_client.rs

@@ -2,7 +2,7 @@ use anyhow::anyhow;
 use async_trait::async_trait;
 use mithril_common::StdResult;
 use mithril_common::messages::ProtocolConfigurationMessage;
-use mithril_protocol_config::http_client::http_impl::ProtocolConfigurationRetriever;
+use mithril_protocol_config::http_client::http_impl::ProtocolConfigurationRetrieverFromAggregator;
 use reqwest::header::{self, HeaderValue};
 use reqwest::{self, Client, Proxy, RequestBuilder, Response, StatusCode};
 use semver::Version;
@@ -382,7 +382,7 @@ impl AggregatorClient for AggregatorHTTPClient {
 }
 
 #[async_trait]
-impl ProtocolConfigurationRetriever for AggregatorHTTPClient {
+impl ProtocolConfigurationRetrieverFromAggregator for AggregatorHTTPClient {
     async fn retrieve_protocol_configuration(
         &self,
         epoch: Epoch,

mithril-signer/src/services/epoch_service.rs

@@ -437,7 +437,9 @@ mod tests {
         double::{Dummy, fake_data},
     };
 
-    use mithril_protocol_config::model::{MithrilNetworkConfigurationForEpoch, SignedEntityTypeConfiguration};
+    use mithril_protocol_config::model::{
+        MithrilNetworkConfigurationForEpoch, SignedEntityTypeConfiguration,
+    };
 
     use crate::database::repository::{ProtocolInitializerRepository, StakePoolStore};
     use crate::database::test_helper::main_db_connection;