Merge pull request #2385 from input-output-hk/djo/2384/aggregator/remove_configuration_from_dep_container

refactor(aggregator): remove deprecated `configuration` field from `DependencyContainer`

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.7.21"
+version = "0.7.22"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -327,7 +327,6 @@ impl DependenciesBuilder {
     pub async fn build_dependency_container(&mut self) -> Result<DependencyContainer> {
         #[allow(deprecated)]
         let dependency_manager = DependencyContainer {
-            config: self.configuration.clone(),
             root_logger: self.root_logger(),
             sqlite_connection: self.get_sqlite_connection().await?,
             sqlite_connection_cardano_transaction_pool: self

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

@@ -26,7 +26,6 @@ use mithril_persistence::{
 use mithril_signed_entity_lock::SignedEntityTypeLock;
 
 use crate::{
-    configuration::*,
     database::repository::{
         CertificateRepository, OpenMessageRepository, SignedEntityStorer, SignerGetter,
         StakePoolStore,
@@ -49,11 +48,6 @@ pub type EpochServiceWrapper = Arc<RwLock<dyn EpochService>>;
 
 /// DependencyManager handles the dependencies
 pub struct DependencyContainer {
-    /// Configuration structure.
-    // TODO: remove this field and only use the `Configuration` in the dependencies builder
-    #[deprecated]
-    pub config: Configuration,
-
     /// Application root logger
     pub root_logger: Logger,
 
@@ -209,17 +203,19 @@ impl DependencyContainer {
     ///
     /// Fill the stores of a [DependencyManager] in a way to simulate an aggregator state
     /// using the data from a precomputed fixture.
-    pub async fn init_state_from_fixture(&self, fixture: &MithrilFixture, target_epochs: &[Epoch]) {
+    pub async fn init_state_from_fixture(
+        &self,
+        fixture: &MithrilFixture,
+        cardano_transactions_signing_config: &CardanoTransactionsSigningConfig,
+        target_epochs: &[Epoch],
+    ) {
         for epoch in target_epochs {
             self.epoch_settings_storer
                 .save_epoch_settings(
                     *epoch,
-                    #[allow(deprecated)]
                     AggregatorEpochSettings {
                         protocol_parameters: fixture.protocol_parameters(),
-                        cardano_transactions_signing_config: self
-                            .config
-                            .cardano_transactions_signing_config
+                        cardano_transactions_signing_config: cardano_transactions_signing_config
                             .clone(),
                     },
                 )

mithril-aggregator/src/dependency_injection/containers.rs

@@ -532,7 +532,8 @@ pub mod tests {
     use async_trait::async_trait;
     use chrono::{DateTime, Utc};
     use mithril_common::entities::{
-        ChainPoint, Epoch, SignedEntityConfig, SignedEntityTypeDiscriminants,
+        CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityConfig,
+        SignedEntityTypeDiscriminants,
     };
     use mithril_common::temp_dir;
     use mithril_common::{
@@ -575,6 +576,7 @@ pub mod tests {
             .unwrap();
         deps.init_state_from_fixture(
             &fixture,
+            &CardanoTransactionsSigningConfig::dummy(),
             &[
                 current_epoch.offset_to_signer_retrieval_epoch().unwrap(),
                 current_epoch,

mithril-aggregator/src/runtime/runner.rs

@@ -439,6 +439,8 @@ mod tests {
         current_epoch: Option<Epoch>,
     ) -> MithrilCertifierService {
         let configuration = Configuration::new_sample(snapshot_directory);
+        let cardano_transactions_signing_config =
+            configuration.cardano_transactions_signing_config.clone();
         let mut dependency_builder = DependenciesBuilder::new_with_stdout_logger(configuration);
         if let Some(epoch) = current_epoch {
             dependency_builder.epoch_service = Some(Arc::new(RwLock::new(
@@ -451,7 +453,11 @@ mod tests {
             .await
             .unwrap();
         dependency_manager
-            .init_state_from_fixture(fixture, epochs_with_signers)
+            .init_state_from_fixture(
+                fixture,
+                &cardano_transactions_signing_config,
+                epochs_with_signers,
+            )
             .await;
 
         MithrilCertifierService::from_deps(network, dependency_builder).await

mithril-aggregator/src/services/certifier/certifier_service.rs

@@ -17,9 +17,9 @@ use mithril_common::{
     crypto_helper::ProtocolGenesisSigner,
     digesters::{DumbImmutableDigester, DumbImmutableFileObserver},
     entities::{
-        BlockNumber, Certificate, CertificateSignature, ChainPoint, Epoch, ImmutableFileNumber,
-        SignedEntityType, SignedEntityTypeDiscriminants, SingleSignatureAuthenticationStatus,
-        SlotNumber, Snapshot, StakeDistribution, TimePoint,
+        BlockNumber, CardanoTransactionsSigningConfig, Certificate, CertificateSignature,
+        ChainPoint, Epoch, ImmutableFileNumber, SignedEntityType, SignedEntityTypeDiscriminants,
+        SingleSignatureAuthenticationStatus, SlotNumber, Snapshot, StakeDistribution, TimePoint,
     },
     era::{adapters::EraReaderDummyAdapter, EraMarker, EraReader, SupportedEra},
     test_utils::{
@@ -105,6 +105,7 @@ macro_rules! assert_metrics_eq {
 
 pub struct RuntimeTester {
     pub network: String,
+    pub cardano_transactions_signing_config: CardanoTransactionsSigningConfig,
     pub snapshot_uploader: Arc<DumbUploader>,
     pub chain_observer: Arc<FakeObserver>,
     pub immutable_file_observer: Arc<DumbImmutableFileObserver>,
@@ -134,6 +135,8 @@ impl RuntimeTester {
         let logger = build_logger();
         let global_logger = slog_scope::set_global_logger(logger.clone());
         let network = configuration.network.clone();
+        let cardano_transactions_signing_config =
+            configuration.cardano_transactions_signing_config.clone();
         let snapshot_uploader = Arc::new(DumbUploader::default());
         let immutable_file_observer = Arc::new(DumbImmutableFileObserver::new());
         immutable_file_observer
@@ -173,6 +176,7 @@ impl RuntimeTester {
 
         Self {
             network,
+            cardano_transactions_signing_config,
             snapshot_uploader,
             chain_observer,
             immutable_file_observer,
@@ -237,7 +241,11 @@ impl RuntimeTester {
         // Init the stores needed for a genesis certificate
         let genesis_epochs = self.dependencies.get_genesis_epochs().await;
         self.dependencies
-            .init_state_from_fixture(fixture, &[genesis_epochs.0, genesis_epochs.1])
+            .init_state_from_fixture(
+                fixture,
+                &self.cardano_transactions_signing_config,
+                &[genesis_epochs.0, genesis_epochs.1],
+            )
             .await;
         Ok(())
     }