feat: wire the CardanoDatabaseSignableBuilder in the MithrilSignableBuilderService

dlachaume · dlachaume · commit cc6dd8ef05ea · 2024-11-28T15:47:11.000+01:00
diff --git a/mithril-aggregator/src/dependency_injection/builder.rs b/mithril-aggregator/src/dependency_injection/builder.rs
@@ -35,10 +35,11 @@ use mithril_common::{
         EraChecker, EraMarker, EraReader, EraReaderAdapter, SupportedEra,
     },
     signable_builder::{
-        CardanoImmutableFilesFullSignableBuilder, CardanoStakeDistributionSignableBuilder,
-        CardanoTransactionsSignableBuilder, MithrilSignableBuilderService,
-        MithrilStakeDistributionSignableBuilder, SignableBuilderService,
-        SignableBuilderServiceDependencies, SignableSeedBuilder, TransactionsImporter,
+        CardanoDatabaseSignableBuilder, CardanoImmutableFilesFullSignableBuilder,
+        CardanoStakeDistributionSignableBuilder, CardanoTransactionsSignableBuilder,
+        MithrilSignableBuilderService, MithrilStakeDistributionSignableBuilder,
+        SignableBuilderService, SignableBuilderServiceDependencies, SignableSeedBuilder,
+        TransactionsImporter,
     },
     signed_entity_type_lock::SignedEntityTypeLock,
     MithrilTickerService, TickerService,
@@ -1128,12 +1129,18 @@ impl DependenciesBuilder {
         let cardano_stake_distribution_builder = Arc::new(
             CardanoStakeDistributionSignableBuilder::new(self.get_stake_store().await?),
         );
+        let cardano_database_signable_builder = Arc::new(CardanoDatabaseSignableBuilder::new(
+            self.get_immutable_digester().await?,
+            &self.configuration.db_directory,
+            self.root_logger(),
+        ));
         let era_checker = self.get_era_checker().await?;
         let signable_builders_dependencies = SignableBuilderServiceDependencies::new(
             mithril_stake_distribution_builder,
             immutable_signable_builder,
             cardano_transactions_builder,
             cardano_stake_distribution_builder,
+            cardano_database_signable_builder,
         );
         let signable_builder_service = Arc::new(MithrilSignableBuilderService::new(
             era_checker,
diff --git a/mithril-common/src/signable_builder/signable_builder_service.rs b/mithril-common/src/signable_builder/signable_builder_service.rs
@@ -33,6 +33,7 @@ pub struct MithrilSignableBuilderService {
     immutable_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
     cardano_transactions_signable_builder: Arc<dyn SignableBuilder<BlockNumber>>,
     cardano_stake_distribution_builder: Arc<dyn SignableBuilder<Epoch>>,
+    cardano_database_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
     logger: Logger,
 }
 
@@ -42,6 +43,7 @@ pub struct SignableBuilderServiceDependencies {
     immutable_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
     cardano_transactions_signable_builder: Arc<dyn SignableBuilder<BlockNumber>>,
     cardano_stake_distribution_builder: Arc<dyn SignableBuilder<Epoch>>,
+    cardano_database_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
 }
 
 impl SignableBuilderServiceDependencies {
@@ -51,12 +53,14 @@ impl SignableBuilderServiceDependencies {
         immutable_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
         cardano_transactions_signable_builder: Arc<dyn SignableBuilder<BlockNumber>>,
         cardano_stake_distribution_builder: Arc<dyn SignableBuilder<Epoch>>,
+        cardano_database_signable_builder: Arc<dyn SignableBuilder<CardanoDbBeacon>>,
     ) -> Self {
         Self {
             mithril_stake_distribution_builder,
             immutable_signable_builder,
             cardano_transactions_signable_builder,
             cardano_stake_distribution_builder,
+            cardano_database_signable_builder,
         }
     }
 }
@@ -77,6 +81,7 @@ impl MithrilSignableBuilderService {
             cardano_transactions_signable_builder: dependencies
                 .cardano_transactions_signable_builder,
             cardano_stake_distribution_builder: dependencies.cardano_stake_distribution_builder,
+            cardano_database_signable_builder: dependencies.cardano_database_signable_builder,
             logger: logger.new_with_component_name::<Self>(),
         }
     }
@@ -117,11 +122,14 @@ impl MithrilSignableBuilderService {
                 .with_context(|| format!(
                     "Signable builder service can not compute protocol message with block_number: '{block_number}'"
                 ))?,
-            SignedEntityType::CardanoDatabase(_) => {
-                return Err(anyhow::anyhow!(
-                    "Signable builder service can not compute protocol message for Cardano database because it is not yet implemented."
-                ));
-            }
+            SignedEntityType::CardanoDatabase(beacon) =>
+                self
+                .cardano_database_signable_builder
+                .compute_protocol_message(beacon.clone())
+                .await
+                .with_context(|| format!(
+                    "Signable builder service can not compute protocol message for Cardano database with beacon: '{beacon}'"
+                ))?,
         };
 
         Ok(protocol_message)
@@ -208,6 +216,7 @@ mod tests {
             MockSignableBuilderImpl<CardanoDbBeacon>,
         mock_cardano_transactions_signable_builder: MockSignableBuilderImpl<BlockNumber>,
         mock_cardano_stake_distribution_signable_builder: MockSignableBuilderImpl<Epoch>,
+        mock_cardano_database_signable_builder: MockSignableBuilderImpl<CardanoDbBeacon>,
     }
 
     impl MockDependencyInjector {
@@ -219,6 +228,7 @@ mod tests {
                 mock_cardano_immutable_files_full_signable_builder: MockSignableBuilderImpl::new(),
                 mock_cardano_stake_distribution_signable_builder: MockSignableBuilderImpl::new(),
                 mock_cardano_transactions_signable_builder: MockSignableBuilderImpl::new(),
+                mock_cardano_database_signable_builder: MockSignableBuilderImpl::new(),
             }
         }
 
@@ -228,6 +238,7 @@ mod tests {
                 Arc::new(self.mock_cardano_immutable_files_full_signable_builder),
                 Arc::new(self.mock_cardano_transactions_signable_builder),
                 Arc::new(self.mock_cardano_stake_distribution_signable_builder),
+                Arc::new(self.mock_cardano_database_signable_builder),
             );
 
             MithrilSignableBuilderService::new(
@@ -340,17 +351,21 @@ mod tests {
         }
 
         #[tokio::test]
-        async fn build_cardano_database_signable_when_given_cardano_database_entity_type_return_error(
-        ) {
+        async fn build_cardano_database_signable_when_given_cardano_database_entity_type() {
             let current_era = SupportedEra::Pythagoras;
-            let mock_container = MockDependencyInjector::new(current_era);
+            let mut mock_container = build_mock_container(current_era);
+            mock_container
+                .mock_cardano_database_signable_builder
+                .expect_compute_protocol_message()
+                .once()
+                .return_once(|_| Ok(ProtocolMessage::new()));
             let signable_builder_service = mock_container.build_signable_builder_service();
             let signed_entity_type = SignedEntityType::CardanoDatabase(CardanoDbBeacon::default());
 
             signable_builder_service
                 .compute_protocol_message(signed_entity_type)
                 .await
-                .expect_err("Should return error because CardanoDatabase is not implemented yet.");
+                .unwrap();
         }
     }
 
@@ -443,5 +458,23 @@ mod tests {
                 .await
                 .unwrap();
         }
+
+        #[tokio::test]
+        async fn build_cardano_database_signable_when_given_cardano_database_entity_type() {
+            let current_era = SupportedEra::Thales;
+            let mut mock_container = build_mock_container(current_era);
+            mock_container
+                .mock_cardano_database_signable_builder
+                .expect_compute_protocol_message()
+                .once()
+                .return_once(|_| Ok(ProtocolMessage::new()));
+            let signable_builder_service = mock_container.build_signable_builder_service();
+            let signed_entity_type = SignedEntityType::CardanoDatabase(CardanoDbBeacon::default());
+
+            signable_builder_service
+                .compute_protocol_message(signed_entity_type)
+                .await
+                .unwrap();
+        }
     }
 }
diff --git a/mithril-signer/src/dependency_injection/builder.rs b/mithril-signer/src/dependency_injection/builder.rs
@@ -22,9 +22,10 @@ use mithril_common::digesters::{
 };
 use mithril_common::era::{EraChecker, EraReader};
 use mithril_common::signable_builder::{
-    CardanoImmutableFilesFullSignableBuilder, CardanoStakeDistributionSignableBuilder,
-    CardanoTransactionsSignableBuilder, MithrilSignableBuilderService,
-    MithrilStakeDistributionSignableBuilder, SignableBuilderServiceDependencies,
+    CardanoDatabaseSignableBuilder, CardanoImmutableFilesFullSignableBuilder,
+    CardanoStakeDistributionSignableBuilder, CardanoTransactionsSignableBuilder,
+    MithrilSignableBuilderService, MithrilStakeDistributionSignableBuilder,
+    SignableBuilderServiceDependencies,
 };
 use mithril_common::signed_entity_type_lock::SignedEntityTypeLock;
 use mithril_common::{MithrilTickerService, StdResult, TickerService};
@@ -328,6 +329,11 @@ impl<'a> DependenciesBuilder<'a> {
         let cardano_stake_distribution_signable_builder = Arc::new(
             CardanoStakeDistributionSignableBuilder::new(stake_store.clone()),
         );
+        let cardano_database_signable_builder = Arc::new(CardanoDatabaseSignableBuilder::new(
+            digester.clone(),
+            &self.config.db_directory,
+            self.root_logger(),
+        ));
         let epoch_service = Arc::new(RwLock::new(MithrilEpochService::new(
             stake_store.clone(),
             protocol_initializer_store.clone(),
@@ -347,6 +353,7 @@ impl<'a> DependenciesBuilder<'a> {
             cardano_immutable_snapshot_builder,
             cardano_transactions_builder,
             cardano_stake_distribution_signable_builder,
+            cardano_database_signable_builder,
         );
         let signable_builder_service = Arc::new(MithrilSignableBuilderService::new(
             era_checker.clone(),
diff --git a/mithril-signer/src/runtime/runner.rs b/mithril-signer/src/runtime/runner.rs
@@ -327,7 +327,9 @@ impl Runner for SignerRunner {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::signable_builder::SignableBuilderServiceDependencies;
+    use mithril_common::signable_builder::{
+        CardanoDatabaseSignableBuilder, SignableBuilderServiceDependencies,
+    };
     use mockall::mock;
     use mockall::predicate::eq;
     use std::collections::BTreeSet;
@@ -447,6 +449,11 @@ mod tests {
         let cardano_stake_distribution_builder = Arc::new(
             CardanoStakeDistributionSignableBuilder::new(stake_store.clone()),
         );
+        let cardano_database_signable_builder = Arc::new(CardanoDatabaseSignableBuilder::new(
+            digester.clone(),
+            Path::new(""),
+            logger.clone(),
+        ));
         let protocol_initializer_store = Arc::new(ProtocolInitializerRepository::new(
             sqlite_connection.clone(),
             None,
@@ -470,6 +477,7 @@ mod tests {
             cardano_immutable_signable_builder,
             cardano_transactions_builder,
             cardano_stake_distribution_builder,
+            cardano_database_signable_builder,
         );
         let signable_builder_service = Arc::new(MithrilSignableBuilderService::new(
             era_checker.clone(),
diff --git a/mithril-signer/tests/test_extensions/state_machine_tester.rs b/mithril-signer/tests/test_extensions/state_machine_tester.rs
@@ -28,9 +28,10 @@ use mithril_common::{
     },
     era::{adapters::EraReaderDummyAdapter, EraChecker, EraMarker, EraReader, SupportedEra},
     signable_builder::{
-        CardanoImmutableFilesFullSignableBuilder, CardanoStakeDistributionSignableBuilder,
-        CardanoTransactionsSignableBuilder, MithrilSignableBuilderService,
-        MithrilStakeDistributionSignableBuilder, SignableBuilderServiceDependencies,
+        CardanoDatabaseSignableBuilder, CardanoImmutableFilesFullSignableBuilder,
+        CardanoStakeDistributionSignableBuilder, CardanoTransactionsSignableBuilder,
+        MithrilSignableBuilderService, MithrilStakeDistributionSignableBuilder,
+        SignableBuilderServiceDependencies,
     },
     signed_entity_type_lock::SignedEntityTypeLock,
     MithrilTickerService, StdError, TickerService,
@@ -211,6 +212,11 @@ impl StateMachineTester {
         let cardano_stake_distribution_builder = Arc::new(
             CardanoStakeDistributionSignableBuilder::new(stake_store.clone()),
         );
+        let cardano_database_signable_builder = Arc::new(CardanoDatabaseSignableBuilder::new(
+            digester.clone(),
+            Path::new(""),
+            logger.clone(),
+        ));
         let epoch_service = Arc::new(RwLock::new(MithrilEpochService::new(
             stake_store.clone(),
             protocol_initializer_store.clone(),
@@ -230,6 +236,7 @@ impl StateMachineTester {
             cardano_immutable_snapshot_builder,
             cardano_transactions_builder,
             cardano_stake_distribution_builder,
+            cardano_database_signable_builder,
         );
         let signable_builder_service = Arc::new(MithrilSignableBuilderService::new(
             era_checker.clone(),
