refactor(common, signer): read available signed entity types from current epoch (aggregation)

Author: turmelclem

internal/mithril-protocol-config/src/test/double/configuration_provider.rs

@@ -12,13 +12,13 @@ use mithril_common::{StdResult, entities::Epoch};
 /// A fake [MithrilNetworkConfigurationProvider] that return [MithrilNetworkConfiguration]
 pub struct FakeMithrilNetworkConfigurationProvider {
     /// Configuration for aggregation
-    pub configuration_for_aggregation: EpochConfiguration,
+    pub configuration_for_aggregation: RwLock<EpochConfiguration>,
 
     /// Configuration for next aggregation
     pub configuration_for_next_aggregation: RwLock<EpochConfiguration>,
 
     /// Configuration for registration
-    pub configuration_for_registration: EpochConfiguration,
+    pub configuration_for_registration: RwLock<EpochConfiguration>,
 }
 
 impl FakeMithrilNetworkConfigurationProvider {
@@ -29,17 +29,16 @@ impl FakeMithrilNetworkConfigurationProvider {
         configuration_for_registration: EpochConfiguration,
     ) -> Self {
         Self {
-            configuration_for_aggregation,
+            configuration_for_aggregation: RwLock::new(configuration_for_aggregation),
             configuration_for_next_aggregation: RwLock::new(configuration_for_next_aggregation),
-            configuration_for_registration,
+            configuration_for_registration: RwLock::new(configuration_for_registration),
         }
     }
 
-    ///Change the configuration of the next aggregation
-    pub async fn change_next_aggregation_configuration(&self, conf: EpochConfiguration) {
-        let mut configuration_for_next_aggregation =
-            self.configuration_for_next_aggregation.write().await;
-        *configuration_for_next_aggregation = conf;
+    ///Change the configuration of the aggregation
+    pub async fn change_aggregation_configuration(&self, conf: EpochConfiguration) {
+        let mut configuration_for_aggregation = self.configuration_for_aggregation.write().await;
+        *configuration_for_aggregation = conf;
     }
 }
 
@@ -50,14 +49,19 @@ impl MithrilNetworkConfigurationProvider for FakeMithrilNetworkConfigurationProv
         &self,
         epoch: Epoch,
     ) -> StdResult<MithrilNetworkConfiguration> {
+        let configuration_for_aggregation = self.configuration_for_aggregation.read().await.clone();
+
         let configuration_for_next_aggregation =
             self.configuration_for_next_aggregation.read().await.clone();
 
+        let configuration_for_registration =
+            self.configuration_for_registration.read().await.clone();
+
         Ok(MithrilNetworkConfiguration {
             epoch,
-            configuration_for_aggregation: self.configuration_for_aggregation.clone(),
+            configuration_for_aggregation,
             configuration_for_next_aggregation,
-            configuration_for_registration: self.configuration_for_registration.clone(),
+            configuration_for_registration,
         })
     }
 }

mithril-signer/src/runtime/runner.rs

@@ -776,7 +776,7 @@ mod tests {
 
         let mithril_network_configuration = MithrilNetworkConfiguration {
             epoch,
-            configuration_for_next_aggregation: EpochConfiguration {
+            configuration_for_aggregation: EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::from([
                     SignedEntityTypeDiscriminants::MithrilStakeDistribution,
                     SignedEntityTypeDiscriminants::CardanoTransactions,

mithril-signer/src/services/cardano_transactions/preloader_checker.rs

@@ -40,7 +40,7 @@ impl CardanoTransactionsPreloaderChecker for CardanoTransactionsPreloaderActivat
             ))?;
 
         let activated_signed_entity_types = configuration
-            .configuration_for_next_aggregation
+            .configuration_for_aggregation
             .enabled_signed_entity_types;
 
         Ok(activated_signed_entity_types
@@ -88,7 +88,7 @@ mod tests {
             .times(1)
             .returning(|_| {
                 Ok(MithrilNetworkConfiguration {
-                    configuration_for_next_aggregation: EpochConfiguration {
+                    configuration_for_aggregation: EpochConfiguration {
                         enabled_signed_entity_types: BTreeSet::from([
                             SignedEntityTypeDiscriminants::MithrilStakeDistribution,
                         ]),
@@ -122,7 +122,7 @@ mod tests {
             .times(1)
             .returning(|_| {
                 Ok(MithrilNetworkConfiguration {
-                    configuration_for_next_aggregation: EpochConfiguration {
+                    configuration_for_aggregation: EpochConfiguration {
                         enabled_signed_entity_types: BTreeSet::from([
                             SignedEntityTypeDiscriminants::CardanoTransactions,
                         ]),

mithril-signer/src/services/epoch_service.rs

@@ -190,7 +190,7 @@ impl EpochService for MithrilEpochService {
             .await?;
 
         let allowed_discriminants = mithril_network_configuration
-            .configuration_for_next_aggregation
+            .configuration_for_aggregation
             .enabled_signed_entity_types
             .clone();
 
@@ -486,7 +486,7 @@ mod tests {
         let epoch = Epoch(12);
         let mithril_network_configuration = MithrilNetworkConfiguration {
             epoch,
-            configuration_for_next_aggregation: EpochConfiguration {
+            configuration_for_aggregation: EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::new(),
                 ..Dummy::dummy()
             },
@@ -673,7 +673,7 @@ mod tests {
         let epoch = Epoch(12);
         let mithril_network_configuration = MithrilNetworkConfiguration {
             epoch,
-            configuration_for_next_aggregation: EpochConfiguration {
+            configuration_for_aggregation: EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::from([
                     SignedEntityTypeDiscriminants::CardanoImmutableFilesFull,
                 ]),
@@ -790,7 +790,7 @@ mod tests {
         // MithrilNetworkConfiguration
         let mithril_network_configuration = MithrilNetworkConfiguration {
             epoch,
-            configuration_for_next_aggregation: EpochConfiguration {
+            configuration_for_aggregation: EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::new(),
                 ..Dummy::dummy()
             },
@@ -863,7 +863,7 @@ mod tests {
 
         let mithril_network_configuration = MithrilNetworkConfiguration {
             epoch,
-            configuration_for_next_aggregation: EpochConfiguration {
+            configuration_for_aggregation: EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::new(),
                 ..Dummy::dummy()
             },
@@ -913,12 +913,10 @@ mod tests {
                 signed_entity_types_config: SignedEntityTypeConfiguration {
                     cardano_transactions: None,
                 },
-                ..Dummy::dummy()
-            };
-            let configuration_for_next_aggregation = EpochConfiguration {
                 enabled_signed_entity_types: BTreeSet::new(),
                 ..Dummy::dummy()
             };
+            let configuration_for_next_aggregation = EpochConfiguration::dummy();
 
             epoch_service
                 .write()
@@ -946,7 +944,7 @@ mod tests {
             let allowed_discriminants =
                 BTreeSet::from([SignedEntityTypeDiscriminants::CardanoImmutableFilesFull]);
 
-            let configuration_for_next_aggregation = EpochConfiguration {
+            let configuration_for_aggregation = EpochConfiguration {
                 enabled_signed_entity_types: allowed_discriminants.clone(),
                 ..Dummy::dummy()
             };
@@ -961,7 +959,7 @@ mod tests {
                 .inform_epoch_settings(
                     fake_data::beacon().epoch,
                     MithrilNetworkConfiguration {
-                        configuration_for_next_aggregation,
+                        configuration_for_aggregation,
                         ..Dummy::dummy()
                     },
                     current_signers,

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -179,14 +179,12 @@ impl StateMachineTester {
             signed_entity_types_config: SignedEntityTypeConfiguration {
                 cardano_transactions: Some(cardano_transactions_signing_config.clone()),
             },
-            ..Dummy::dummy()
-        };
-
-        let configuration_for_next_aggregation = EpochConfiguration {
             enabled_signed_entity_types: SignedEntityTypeDiscriminants::all(),
             ..Dummy::dummy()
         };
 
+        let configuration_for_next_aggregation = EpochConfiguration::dummy();
+
         let configuration_for_registration = EpochConfiguration {
             protocol_parameters: fake_data::protocol_parameters(),
             ..Dummy::dummy()
@@ -492,13 +490,13 @@ impl StateMachineTester {
             enabled_signed_entity_types: BTreeSet::from_iter(discriminants.iter().cloned()),
             ..self
                 .network_configuration_service
-                .configuration_for_next_aggregation
+                .configuration_for_aggregation
                 .read()
                 .await
                 .clone()
         };
         self.network_configuration_service
-            .change_next_aggregation_configuration(config)
+            .change_aggregation_configuration(config)
             .await;
         self
     }