rename builder for immutables

Author: ghubertpalo

mithril-aggregator/src/dependency_injection/builder.rs

@@ -16,7 +16,7 @@ use mithril_common::{
         adapters::{EraReaderAdapterBuilder, EraReaderDummyAdapter},
         EraChecker, EraMarker, EraReader, EraReaderAdapter, SupportedEra,
     },
-    signable_builder::ImmutableSignableBuilder,
+    signable_builder::CardanoImmutableFilesFullSignableBuilder,
     store::adapter::{MemoryAdapter, SQLiteAdapter, StoreAdapter},
     BeaconProvider, BeaconProviderImpl,
 };
@@ -876,7 +876,7 @@ impl DependenciesBuilder {
         let multi_signer = self.get_multi_signer().await?;
         let mithril_stake_distribution_builder =
             MithrilStakeDistributionSignableBuilder::new(multi_signer);
-        let immutable_signable_builder = ImmutableSignableBuilder::new(
+        let immutable_signable_builder = CardanoImmutableFilesFullSignableBuilder::new(
             self.get_immutable_digester().await?,
             self.get_logger().await?,
         );

mithril-aggregator/src/signable_builder/signable_builder_service.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use mithril_common::{
     entities::SignedEntityType,
-    signable_builder::{ImmutableSignableBuilder, Signable, SignableBuilder},
+    signable_builder::{CardanoImmutableFilesFullSignableBuilder, Signable, SignableBuilder},
     StdResult,
 };
 
@@ -11,14 +11,14 @@ use super::MithrilStakeDistributionSignableBuilder;
 /// SignableBuilder Service
 pub struct SignableBuilderService {
     mithril_stake_distribution_builder: MithrilStakeDistributionSignableBuilder,
-    immutable_signable_builder: ImmutableSignableBuilder,
+    immutable_signable_builder: CardanoImmutableFilesFullSignableBuilder,
 }
 
 impl SignableBuilderService {
     /// SignableBuilderService factory
     pub fn new(
         mithril_stake_distribution_builder: MithrilStakeDistributionSignableBuilder,
-        immutable_signable_builder: ImmutableSignableBuilder,
+        immutable_signable_builder: CardanoImmutableFilesFullSignableBuilder,
     ) -> Self {
         Self {
             mithril_stake_distribution_builder,

mithril-common/src/digesters/cache/json_provider.rs

@@ -261,7 +261,7 @@ mod tests {
 
     #[tokio::test]
     async fn reset_clear_existing_values() {
-        let file = get_test_dir("store_erase_existing_values").join("immutable-cache-store.json");
+        let file = get_test_dir("reset_clear_existing_values").join("immutable-cache-store.json");
         let provider = JsonImmutableFileDigestCacheProvider::new(&file);
         let values_to_store = vec![
             ("0.chunk".to_string(), "digest 0".to_string()),

mithril-common/src/signable_builder/immutable_signable_builder.rs renamed to mithril-common/src/signable_builder/cardano_immutable_full_signable_builder.rs

@@ -10,12 +10,12 @@ use async_trait::async_trait;
 use slog::{debug, info, Logger};
 
 /// This structure is responsible of calculating the message for Cardano immutable files snapshots.
-pub struct ImmutableSignableBuilder {
+pub struct CardanoImmutableFilesFullSignableBuilder {
     immutable_digester: Arc<dyn ImmutableDigester>,
     logger: Logger,
 }
 
-impl ImmutableSignableBuilder {
+impl CardanoImmutableFilesFullSignableBuilder {
     /// Constructor
     pub fn new(immutable_digester: Arc<dyn ImmutableDigester>, logger: Logger) -> Self {
         Self {
@@ -26,7 +26,7 @@ impl ImmutableSignableBuilder {
 }
 
 #[async_trait]
-impl SignableBuilder<Beacon, ProtocolMessage> for ImmutableSignableBuilder {
+impl SignableBuilder<Beacon, ProtocolMessage> for CardanoImmutableFilesFullSignableBuilder {
     async fn compute_signable(&self, beacon: Beacon) -> StdResult<ProtocolMessage> {
         debug!(self.logger, "SignableBuilder::compute_signable({beacon:?})");
         let digest = self.immutable_digester.compute_digest(&beacon).await?;
@@ -66,7 +66,8 @@ mod tests {
     #[tokio::test]
     async fn compute_signable() {
         let digester = ImmutableDigesterImpl::default();
-        let signable_builder = ImmutableSignableBuilder::new(Arc::new(digester), create_logger());
+        let signable_builder =
+            CardanoImmutableFilesFullSignableBuilder::new(Arc::new(digester), create_logger());
         let protocol_message = signable_builder
             .compute_signable(Beacon::default())
             .await

mithril-common/src/signable_builder/mod.rs

@@ -1,9 +1,9 @@
 //! The module used for building signables
 
+mod cardano_immutable_full_signable_builder;
 mod dummy_signable;
-mod immutable_signable_builder;
 mod interface;
 
+pub use cardano_immutable_full_signable_builder::*;
 pub use dummy_signable::*;
-pub use immutable_signable_builder::*;
 pub use interface::*;

mithril-signer/src/runtime/runner.rs

@@ -485,7 +485,7 @@ mod tests {
             adapters::{EraReaderAdapterType, EraReaderBootstrapAdapter},
             EraChecker, EraReader,
         },
-        signable_builder::ImmutableSignableBuilder,
+        signable_builder::CardanoImmutableFilesFullSignableBuilder,
         store::{
             adapter::{DumbStoreAdapter, MemoryAdapter},
             StakeStore, StakeStorer,
@@ -535,7 +535,7 @@ mod tests {
         let api_version_provider = Arc::new(APIVersionProvider::new(era_checker.clone()));
         let digester = Arc::new(DumbImmutableDigester::new(DIGESTER_RESULT, true));
         let signable_builder =
-            ImmutableSignableBuilder::new(digester.clone(), slog_scope::logger());
+            CardanoImmutableFilesFullSignableBuilder::new(digester.clone(), slog_scope::logger());
 
         let signable_builder_service = Arc::new(SignableBuilderService::new(signable_builder));
 

mithril-signer/src/runtime/signer_services.rs

@@ -14,7 +14,7 @@ use mithril_common::{
     },
     digesters::{CardanoImmutableDigester, ImmutableDigester, ImmutableFileSystemObserver},
     era::{EraChecker, EraReader},
-    signable_builder::ImmutableSignableBuilder,
+    signable_builder::CardanoImmutableFilesFullSignableBuilder,
     store::{adapter::SQLiteAdapter, StakeStore},
     BeaconProvider, BeaconProviderImpl, StdError,
 };
@@ -202,7 +202,7 @@ impl<'a> ServiceBuilder for ProductionServiceBuilder<'a> {
         ));
 
         let dummy_signable_builder =
-            ImmutableSignableBuilder::new(digester.clone(), slog_scope::logger());
+            CardanoImmutableFilesFullSignableBuilder::new(digester.clone(), slog_scope::logger());
         let signable_builder_service =
             Arc::new(SignableBuilderService::new(dummy_signable_builder));
 

mithril-signer/src/signable_builder/signable_builder_service.rs

@@ -2,19 +2,19 @@ use std::sync::Arc;
 
 use mithril_common::{
     entities::SignedEntityType,
-    signable_builder::{ImmutableSignableBuilder, Signable, SignableBuilder},
+    signable_builder::{CardanoImmutableFilesFullSignableBuilder, Signable, SignableBuilder},
     StdResult,
 };
 
 /// SignableBuilder Service
 // TODO: temporary implementation
 pub struct SignableBuilderService {
-    immutable_signable_builder: ImmutableSignableBuilder,
+    immutable_signable_builder: CardanoImmutableFilesFullSignableBuilder,
 }
 
 impl SignableBuilderService {
     /// SignableBuilderService factory
-    pub fn new(immutable_signable_builder: ImmutableSignableBuilder) -> Self {
+    pub fn new(immutable_signable_builder: CardanoImmutableFilesFullSignableBuilder) -> Self {
         Self {
             immutable_signable_builder,
         }

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -7,7 +7,7 @@ use mithril_common::era::{
     EraChecker, EraReader,
 };
 use mithril_common::era::{EraMarker, SupportedEra};
-use mithril_common::signable_builder::ImmutableSignableBuilder;
+use mithril_common::signable_builder::CardanoImmutableFilesFullSignableBuilder;
 use mithril_common::BeaconProvider;
 use slog::Drain;
 use slog_scope::debug;
@@ -151,7 +151,7 @@ impl StateMachineTester {
         let api_version_provider = Arc::new(APIVersionProvider::new(era_checker.clone()));
 
         let signable_builder =
-            ImmutableSignableBuilder::new(digester.clone(), slog_scope::logger());
+            CardanoImmutableFilesFullSignableBuilder::new(digester.clone(), slog_scope::logger());
         let signable_builder_service = Arc::new(SignableBuilderService::new(signable_builder));
 
         let services = SignerServices {