refactor(signer): rename epoch variable comming from aggregator to avoid ambiguity

Author: turmelclem

mithril-signer/src/runtime/runner.rs

@@ -46,7 +46,7 @@ pub trait Runner: Send + Sync {
     /// Register epoch information
     async fn inform_epoch_settings(
         &self,
-        signer_epoch: Epoch,
+        aggregator_signer_registration_epoch: Epoch,
         mithril_network_configuration: MithrilNetworkConfiguration,
         current_signer: Vec<Signer>,
         next_signer: Vec<Signer>,
@@ -265,22 +265,22 @@ impl Runner for SignerRunner {
 
     async fn inform_epoch_settings(
         &self,
-        signer_epoch: Epoch,
+        aggregator_signer_registration_epoch: Epoch,
         mithril_network_configuration: MithrilNetworkConfiguration,
         current_signer: Vec<Signer>,
         next_signer: Vec<Signer>,
     ) -> StdResult<()> {
         debug!(
             self.logger,
-            ">> inform_epoch_settings(epoch:{})", signer_epoch
+            ">> inform_epoch_settings(epoch:{})", aggregator_signer_registration_epoch
         );
 
         self.services
             .epoch_service
             .write()
             .await
             .inform_epoch_settings(
-                signer_epoch,
+                aggregator_signer_registration_epoch,
                 mithril_network_configuration,
                 current_signer,
                 next_signer,

mithril-signer/src/runtime/state_machine.rs

@@ -298,7 +298,7 @@ impl StateMachine {
     /// Launch the transition process from the `Unregistered` to `ReadyToSign` or `RegisteredNotAbleToSign` state.
     async fn transition_from_unregistered_to_one_of_registered_states(
         &self,
-        signer_epoch: Epoch,
+        aggregator_signer_registration_epoch: Epoch,
         mithril_network_configuration: MithrilNetworkConfiguration,
         current_signer: Vec<Signer>,
         next_signer: Vec<Signer>,
@@ -317,7 +317,7 @@ impl StateMachine {
             })?;
 
         self.runner
-            .inform_epoch_settings(signer_epoch, mithril_network_configuration, current_signer,  next_signer)
+            .inform_epoch_settings(aggregator_signer_registration_epoch, mithril_network_configuration, current_signer,  next_signer)
             .await
             .map_err(|e| RuntimeError::KeepState {
                 message: format!(

mithril-signer/src/services/epoch_service.rs

@@ -36,7 +36,7 @@ pub trait EpochService: Sync + Send {
     /// internal state for the new epoch.
     async fn inform_epoch_settings(
         &mut self,
-        signer_epoch: Epoch,
+        aggregator_signer_registration_epoch: Epoch,
         mithril_network_configuration: MithrilNetworkConfiguration,
         current_signers: Vec<Signer>,
         next_signers: Vec<Signer>,
@@ -170,20 +170,22 @@ impl MithrilEpochService {
 impl EpochService for MithrilEpochService {
     async fn inform_epoch_settings(
         &mut self,
-        signer_epoch: Epoch,
+        aggregator_signer_registration_epoch: Epoch,
         mithril_network_configuration: MithrilNetworkConfiguration,
         current_signers: Vec<Signer>,
         next_signers: Vec<Signer>,
     ) -> StdResult<()> {
-        debug!(self.logger, ">> inform_epoch_settings"; "signer_epoch" => ?signer_epoch, "mithril_network_configuration" => ?mithril_network_configuration, "current_signers" => ?current_signers, "next_signers" => ?next_signers);
+        debug!(self.logger, ">> inform_epoch_settings"; "aggregator_signer_registration_epoch" => ?aggregator_signer_registration_epoch, "mithril_network_configuration" => ?mithril_network_configuration, "current_signers" => ?current_signers, "next_signers" => ?next_signers);
 
         let registration_protocol_parameters = mithril_network_configuration
             .signer_registration_protocol_parameters
             .clone();
 
         let protocol_initializer = self
             .protocol_initializer_store
-            .get_protocol_initializer(signer_epoch.offset_to_signer_retrieval_epoch()?)
+            .get_protocol_initializer(
+                aggregator_signer_registration_epoch.offset_to_signer_retrieval_epoch()?,
+            )
             .await?;
 
         let allowed_discriminants =
@@ -194,7 +196,7 @@ impl EpochService for MithrilEpochService {
             .clone();
 
         self.epoch_data = Some(EpochData {
-            epoch: signer_epoch,
+            epoch: aggregator_signer_registration_epoch,
             registration_protocol_parameters,
             protocol_initializer,
             current_signers,
@@ -377,7 +379,7 @@ pub(crate) mod mock_epoch_service {
         impl EpochService for EpochServiceImpl {
             async fn inform_epoch_settings(
                 &mut self,
-                signer_epoch: Epoch,
+                aggregator_signer_registration_epoch: Epoch,
                 mithril_network_configuration: MithrilNetworkConfiguration,
                 current_signers: Vec<Signer>,
                 next_signers: Vec<Signer>,