refactor(signer): use new shared aggregator client

instead of an internal implementation

Author: Alenar

mithril-signer/src/dependency_injection/builder.rs

@@ -51,12 +51,11 @@ use crate::dependency_injection::SignerDependencyContainer;
 #[cfg(feature = "future_dmq")]
 use crate::services::SignaturePublisherDmq;
 use crate::services::{
-    AggregatorHTTPClient, CardanoTransactionsImporter,
-    CardanoTransactionsPreloaderActivationSigner, MithrilEpochService, MithrilSingleSigner,
-    SignaturePublishRetryPolicy, SignaturePublisherDelayer, SignaturePublisherNoop,
-    SignaturePublisherRetrier, SignerCertifierService, SignerSignableSeedBuilder,
-    SignerSignedEntityConfigProvider, SignerUpkeepService, TransactionsImporterByChunk,
-    TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
+    CardanoTransactionsImporter, CardanoTransactionsPreloaderActivationSigner, MithrilEpochService,
+    MithrilSingleSigner, SignaturePublishRetryPolicy, SignaturePublisherDelayer,
+    SignaturePublisherNoop, SignaturePublisherRetrier, SignerCertifierService,
+    SignerSignableSeedBuilder, SignerSignedEntityConfigProvider, SignerUpkeepService,
+    TransactionsImporterByChunk, TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
 };
 use crate::store::MKTreeStoreSqlite;
 use crate::{
@@ -270,21 +269,14 @@ impl<'a> DependenciesBuilder<'a> {
         ));
 
         let api_version_provider = Arc::new(APIVersionProvider::new(era_checker.clone()));
-        let aggregator_client_for_network_config = Arc::new(
+        let aggregator_client = Arc::new(
             AggregatorHttpClient::builder(self.config.aggregator_endpoint.clone())
                 .with_relay_endpoint(self.config.relay_endpoint.clone())
                 .with_api_version_provider(api_version_provider.clone())
                 .with_timeout(Duration::from_millis(HTTP_REQUEST_TIMEOUT_DURATION))
                 .with_logger(self.root_logger())
                 .build()?,
         );
-        let aggregator_client = Arc::new(AggregatorHTTPClient::new(
-            self.config.aggregator_endpoint.clone(),
-            self.config.relay_endpoint.clone(),
-            api_version_provider.clone(),
-            Some(Duration::from_millis(HTTP_REQUEST_TIMEOUT_DURATION)),
-            self.root_logger(),
-        ));
 
         let cardano_immutable_snapshot_builder =
             Arc::new(CardanoImmutableFilesFullSignableBuilder::new(
@@ -385,7 +377,7 @@ impl<'a> DependenciesBuilder<'a> {
         ));
         let metrics_service = Arc::new(MetricsService::new(self.root_logger())?);
         let network_configuration_service = Arc::new(HttpMithrilNetworkConfigurationProvider::new(
-            aggregator_client_for_network_config,
+            aggregator_client.clone(),
         ));
         let preloader_activation = CardanoTransactionsPreloaderActivationSigner::new(
             network_configuration_service.clone(),

mithril-signer/src/runtime/runner.rs

@@ -134,11 +134,7 @@ impl Runner for SignerRunner {
     ) -> StdResult<Option<SignerEpochSettings>> {
         debug!(self.logger, ">> get_epoch_settings");
 
-        self.services
-            .certificate_handler
-            .retrieve_epoch_settings()
-            .await
-            .map_err(|e| e.into())
+        self.services.certificate_handler.retrieve_epoch_settings().await
     }
 
     async fn get_beacon_to_sign(&self, time_point: TimePoint) -> StdResult<Option<BeaconToSign>> {

mithril-signer/src/runtime/state_machine.rs

@@ -10,9 +10,10 @@ use mithril_common::{
     logging::LoggerExtensions,
 };
 
+use mithril_aggregator_client::AggregatorHttpClientError;
 use mithril_protocol_config::model::MithrilNetworkConfiguration;
 
-use crate::{MetricsService, entities::BeaconToSign, services::AggregatorClientError};
+use crate::{MetricsService, entities::BeaconToSign};
 
 use super::{Runner, RuntimeError};
 
@@ -333,8 +334,8 @@ impl StateMachine {
             epoch: Epoch,
         ) -> Result<Option<SignerState>, RuntimeError> {
             if let Err(e) = register_result {
-                if let Some(AggregatorClientError::RegistrationRoundNotYetOpened(_)) =
-                    e.downcast_ref::<AggregatorClientError>()
+                if let Some(AggregatorHttpClientError::RegistrationRoundNotYetOpened(_)) =
+                    e.downcast_ref::<AggregatorHttpClientError>()
                 {
                     Ok(Some(SignerState::Unregistered { epoch }))
                 } else if e.downcast_ref::<ProtocolInitializerError>().is_some() {
@@ -497,7 +498,6 @@ mod tests {
 
     use crate::SignerEpochSettings;
     use crate::runtime::runner::MockSignerRunner;
-    use crate::services::AggregatorClientError;
     use crate::test_tools::TestLogger;
 
     use super::*;
@@ -720,7 +720,7 @@ mod tests {
             .returning(|| Ok(TimePoint::dummy()));
         runner.expect_update_stake_distribution().once().returning(|_| Ok(()));
         runner.expect_register_signer_to_aggregator().once().returning(|| {
-            Err(AggregatorClientError::RegistrationRoundNotYetOpened(
+            Err(AggregatorHttpClientError::RegistrationRoundNotYetOpened(
                 anyhow!("Not yet opened"),
             ))?
         });