chore(aggregator): remove update_epoch_settings from epoch_service, cleanup dependency injection

Author: turmelclem

mithril-aggregator/src/dependency_injection/builder/mod.rs

@@ -401,9 +401,6 @@ impl DependenciesBuilder {
             signed_entity_service: self.get_signed_entity_service().await?,
             certifier_service: self.get_certifier_service().await?,
             epoch_service: self.get_epoch_service().await?,
-            mithril_network_configuration_provider: self
-                .get_mithril_network_configuration_provider()
-                .await?,
             ticker_service: self.get_ticker_service().await?,
             signed_entity_storer: self.get_signed_entity_storer().await?,
             signer_getter: self.get_signer_store().await?,

mithril-aggregator/src/dependency_injection/containers/serve.rs

@@ -1,4 +1,3 @@
-use mithril_protocol_config::interface::MithrilNetworkConfigurationProvider;
 use slog::Logger;
 use std::sync::Arc;
 use tokio::sync::RwLock;
@@ -101,9 +100,6 @@ pub struct ServeCommandDependenciesContainer {
     /// Epoch service
     pub(crate) epoch_service: EpochServiceWrapper,
 
-    /// Mithril network configuration provider
-    pub(crate) mithril_network_configuration_provider: Arc<dyn MithrilNetworkConfigurationProvider>,
-
     /// Ticker Service
     pub(crate) ticker_service: Arc<dyn TickerService>,
 

mithril-aggregator/src/runtime/runner.rs

@@ -78,9 +78,6 @@ pub trait AggregatorRunnerTrait: Sync + Send {
         force_sync: bool,
     ) -> StdResult<()>;
 
-    /// Ask the EpochService to update the epoch settings.
-    async fn update_epoch_settings(&self) -> StdResult<()>;
-
     /// Compute the protocol message
     async fn compute_protocol_message(
         &self,
@@ -298,16 +295,6 @@ impl AggregatorRunnerTrait for AggregatorRunner {
             .map_err(|e| e.into())
     }
 
-    async fn update_epoch_settings(&self) -> StdResult<()> {
-        debug!(self.logger, ">> update_epoch_settings");
-        self.dependencies
-            .epoch_service
-            .write()
-            .await
-            .update_epoch_settings()
-            .await
-    }
-
     async fn compute_protocol_message(
         &self,
         signed_entity_type: &SignedEntityType,
@@ -908,48 +895,6 @@ pub mod tests {
         runner.upkeep(Epoch(5)).await.unwrap();
     }
 
-    #[tokio::test]
-    async fn test_update_epoch_settings() {
-        let mut mock_certifier_service = MockCertifierService::new();
-        mock_certifier_service
-            .expect_inform_epoch()
-            .returning(|_| Ok(()))
-            .times(1);
-
-        let config = ServeCommandConfiguration::new_sample(temp_dir!());
-        let mut deps = DependenciesBuilder::new_with_stdout_logger(Arc::new(config.clone()))
-            .build_serve_dependencies_container()
-            .await
-            .unwrap();
-        deps.certifier_service = Arc::new(mock_certifier_service);
-        let epoch_settings_storer = deps.epoch_settings_storer.clone();
-        let current_epoch = deps.ticker_service.get_current_epoch().await.unwrap();
-        let insert_epoch = current_epoch.offset_to_epoch_settings_recording_epoch();
-
-        let runner = build_runner_with_fixture_data(deps).await;
-        runner.inform_new_epoch(current_epoch).await.unwrap();
-        runner
-            .update_epoch_settings()
-            .await
-            .expect("update_epoch_settings should not fail");
-
-        let saved_epoch_settings = epoch_settings_storer
-            .get_epoch_settings(insert_epoch)
-            .await
-            .unwrap()
-            .unwrap_or_else(|| panic!("should have epoch settings for epoch {insert_epoch}",));
-
-        assert_eq!(
-            AggregatorEpochSettings {
-                protocol_parameters: config.protocol_parameters.clone(),
-                cardano_transactions_signing_config: config
-                    .cardano_transactions_signing_config
-                    .clone(),
-            },
-            saved_epoch_settings
-        );
-    }
-
     #[tokio::test]
     async fn test_precompute_epoch_data() {
         let mut deps = initialize_dependencies!().await;

mithril-aggregator/src/runtime/state_machine.rs

@@ -268,7 +268,6 @@ impl AggregatorRuntime {
             self.runner.inform_new_epoch(new_time_point.epoch).await?;
             self.runner.upkeep(new_time_point.epoch).await?;
             self.runner.open_signer_registration_round(&new_time_point).await?;
-            self.runner.update_epoch_settings().await?;
             if self.config.is_follower {
                 self.runner
                     .synchronize_follower_aggregator_signer_registration()
@@ -447,7 +446,6 @@ mod tests {
                 .with(predicate::eq(TimePoint::dummy().epoch))
                 .once()
                 .returning(|_| Ok(()));
-            runner.expect_update_epoch_settings().once().returning(|| Ok(()));
             runner.expect_precompute_epoch_data().once().returning(|| Ok(()));
             runner
                 .expect_upkeep()
@@ -510,7 +508,6 @@ mod tests {
                 .with(predicate::eq(TimePoint::dummy().epoch))
                 .once()
                 .returning(|_| Ok(()));
-            runner.expect_update_epoch_settings().once().returning(|| Ok(()));
             runner.expect_precompute_epoch_data().once().returning(|| Ok(()));
             runner
                 .expect_upkeep()
@@ -936,7 +933,6 @@ mod tests {
                 .with(predicate::eq(new_time_point_clone.clone().epoch))
                 .once()
                 .returning(|_| Ok(()));
-            runner.expect_update_epoch_settings().once().returning(|| Ok(()));
             runner.expect_precompute_epoch_data().once().returning(|| Ok(()));
             runner
                 .expect_upkeep()

mithril-aggregator/src/services/epoch_service.rs

@@ -1,7 +1,6 @@
 use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use mithril_protocol_config::interface::MithrilNetworkConfigurationProvider;
-use mithril_protocol_config::model::MithrilNetworkConfiguration;
 use slog::{Logger, debug};
 use std::collections::BTreeSet;
 use std::sync::Arc;
@@ -46,11 +45,6 @@ pub trait EpochService: Sync + Send {
     /// internal state for the new epoch.
     async fn inform_epoch(&mut self, epoch: Epoch) -> StdResult<()>;
 
-    /// Insert future epoch settings in the store based on this service current epoch (epoch offset +2).
-    ///
-    /// Note: must be called after `inform_epoch`.
-    async fn update_epoch_settings(&mut self) -> StdResult<()>;
-
     /// Update the next signers with stake for the next epoch.
     async fn update_next_signers_with_stake(&mut self) -> StdResult<()>;
 
@@ -390,11 +384,6 @@ impl EpochService for MithrilEpochService {
         Ok(())
     }
 
-    async fn update_epoch_settings(&mut self) -> StdResult<()> {
-        debug!(self.logger, ">> update_epoch_settings");
-        todo!("remove")
-    }
-
     async fn update_next_signers_with_stake(&mut self) -> StdResult<()> {
         debug!(self.logger, ">> update_next_signers_with_stake");
 
@@ -542,7 +531,6 @@ pub(crate) struct FakeEpochService {
     epoch_data: Option<EpochData>,
     computed_epoch_data: Option<ComputedEpochData>,
     inform_epoch_error: bool,
-    update_epoch_settings_error: bool,
     precompute_epoch_data_error: bool,
     update_next_signers_with_stake_error: bool,
 }
@@ -631,7 +619,6 @@ impl FakeEpochServiceBuilder {
                 next_protocol_multi_signer,
             }),
             inform_epoch_error: false,
-            update_epoch_settings_error: false,
             precompute_epoch_data_error: false,
             update_next_signers_with_stake_error: false,
         }
@@ -678,7 +665,6 @@ impl FakeEpochService {
             epoch_data: None,
             computed_epoch_data: None,
             inform_epoch_error: false,
-            update_epoch_settings_error: false,
             precompute_epoch_data_error: false,
             update_next_signers_with_stake_error: false,
         }
@@ -687,12 +673,10 @@ impl FakeEpochService {
     pub fn toggle_errors(
         &mut self,
         inform_epoch: bool,
-        update_protocol_parameters: bool,
         precompute_epoch: bool,
         update_next_signers_with_stake: bool,
     ) {
         self.inform_epoch_error = inform_epoch;
-        self.update_epoch_settings_error = update_protocol_parameters;
         self.precompute_epoch_data_error = precompute_epoch;
         self.update_next_signers_with_stake_error = update_next_signers_with_stake;
     }
@@ -720,13 +704,6 @@ impl EpochService for FakeEpochService {
         Ok(())
     }
 
-    async fn update_epoch_settings(&mut self) -> StdResult<()> {
-        if self.update_epoch_settings_error {
-            anyhow::bail!("update_epoch_settings fake error");
-        }
-        Ok(())
-    }
-
     async fn precompute_epoch_data(&mut self) -> StdResult<()> {
         if self.precompute_epoch_data_error {
             anyhow::bail!("precompute_epoch_data fake error");

mithril-aggregator/src/services/signer_registration/follower.rs

@@ -456,7 +456,7 @@ mod tests {
         let signer_registration_follower = MithrilSignerRegistrationFollowerBuilder::default()
             .with_epoch_service({
                 let mut epoch_service = FakeEpochService::without_data();
-                epoch_service.toggle_errors(false, false, false, true);
+                epoch_service.toggle_errors(false, false, true);
 
                 epoch_service
             })

mithril-aggregator/tests/test_extensions/leader_aggregator_http_server.rs

@@ -11,7 +11,7 @@ use axum_test::TestServer;
 use reqwest::Url;
 
 use mithril_aggregator::services::MessageService;
-use mithril_common::entities::SignedEntityTypeDiscriminants;
+use mithril_common::entities::{Epoch, SignedEntityTypeDiscriminants};
 use mithril_common::logging::LoggerExtensions;
 use mithril_common::{StdError, StdResult};
 
@@ -33,6 +33,10 @@ impl LeaderAggregatorHttpServer {
             .route("/certificates", get(certificates_list))
             .route("/certificate/genesis", get(certificate_last_genesis))
             .route("/certificate/{hash}", get(certificate_by_hash))
+            .route(
+                "/protocol-configuration/{epoch}",
+                get(protocol_configuration_by_epoch),
+            )
             .with_state(state);
 
         let server = TestServer::builder().http_transport().build(router)?;
@@ -98,3 +102,19 @@ async fn certificate_by_hash(
         Err(err) => internal_server_error(err).into_response(),
     }
 }
+
+async fn protocol_configuration_by_epoch(
+    Path(epoch): Path<u64>,
+    state: State<LeaderAggregatorRoutesState>,
+) -> Response {
+    slog::debug!(state.logger, "/protocol-configuration/{epoch}");
+    match state
+        .message_service
+        .get_protocol_configuration_message(Epoch(epoch), SignedEntityTypeDiscriminants::all())
+        .await
+    {
+        Ok(Some(message)) => (StatusCode::OK, Json(message)).into_response(),
+        Ok(None) => StatusCode::NOT_FOUND.into_response(),
+        Err(err) => internal_server_error(err).into_response(),
+    }
+}