WIP: refactor(signer): remove usage of registration_protocol_parameters and cardano_transactions_signing_config from EpochSettingsMessage

Author: turmelclem

mithril-signer/src/entities/signer_epoch_settings.rs

@@ -1,24 +1,17 @@
-use mithril_common::entities::{
-    CardanoTransactionsSigningConfig, Epoch, ProtocolParameters, Signer,
-};
+use mithril_common::entities::{Epoch, Signer};
 
 /// SignerEpochSettings represents the settings of an epoch
+/// TODO: rename SignerRegistration ? SignerRegistrationSettings ?
 #[derive(Clone, Debug, PartialEq)]
 pub struct SignerEpochSettings {
     /// Current Epoch
     pub epoch: Epoch,
 
-    /// Registration protocol parameters
-    pub registration_protocol_parameters: ProtocolParameters,
-
     /// Current Signers
     pub current_signers: Vec<Signer>,
 
     /// Signers that will be able to sign on the next epoch
     pub next_signers: Vec<Signer>,
-
-    /// Cardano transactions signing configuration for the current epoch
-    pub cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
 }
 
 #[cfg(test)]
@@ -30,24 +23,16 @@ impl mithril_common::test::double::Dummy for SignerEpochSettings {
         // Beacon
         let beacon = fake_data::beacon();
 
-        // Registration protocol parameters
-        let registration_protocol_parameters = fake_data::protocol_parameters();
-
         // Signers
         let signers = fake_data::signers(5);
         let current_signers = signers[1..3].to_vec();
         let next_signers = signers[2..5].to_vec();
 
-        // Cardano transactions signing configuration
-        let cardano_transactions_signing_config = Some(CardanoTransactionsSigningConfig::dummy());
-
         // Signer Epoch settings
         SignerEpochSettings {
             epoch: beacon.epoch,
-            registration_protocol_parameters,
             current_signers,
             next_signers,
-            cardano_transactions_signing_config,
         }
     }
 }

mithril-signer/src/message_adapters/from_epoch_settings.rs

@@ -14,12 +14,10 @@ impl TryFromMessageAdapter<EpochSettingsMessage, SignerEpochSettings> for FromEp
     fn try_adapt(message: EpochSettingsMessage) -> StdResult<SignerEpochSettings> {
         let epoch_settings = SignerEpochSettings {
             epoch: message.epoch,
-            registration_protocol_parameters: message.signer_registration_protocol_parameters,
             current_signers: SignerMessagePart::try_into_signers(message.current_signers)
                 .with_context(|| "'FromMessageAdapter' can not convert the current signers")?,
             next_signers: SignerMessagePart::try_into_signers(message.next_signers)
                 .with_context(|| "'FromMessageAdapter' can not convert the next signers")?,
-            cardano_transactions_signing_config: message.cardano_transactions_signing_config,
         };
         Ok(epoch_settings)
     }

mithril-signer/src/runtime/state_machine.rs

@@ -175,14 +175,15 @@ impl StateMachine {
                     })?
                 {
                     info!(self.logger, "→ Epoch Signer registrations found");
-                    let network_configuration = self
-                        .runner
-                        .get_mithril_network_configuration(*epoch)
-                        .await
-                        .map_err(|e| RuntimeError::KeepState {
-                            message: "could not retrieve Mithril network configuration".to_string(),
-                            nested_error: Some(e),
-                        })?;
+                    let network_configuration: MithrilNetworkConfiguration =
+                        self.runner.get_mithril_network_configuration(*epoch).await.map_err(
+                            |e| RuntimeError::KeepState {
+                                message: format!(
+                                    "could not retrieve Mithril network configuration for epoch {epoch:?}"
+                                ),
+                                nested_error: Some(e),
+                            },
+                        )?;
                     info!(self.logger, "→ Mithril network configuration found");
 
                     if signer_registrations.epoch >= *epoch {
@@ -552,10 +553,8 @@ mod tests {
         let mut runner = MockSignerRunner::new();
         let epoch_settings = SignerEpochSettings {
             epoch: Epoch(3),
-            registration_protocol_parameters: fake_data::protocol_parameters(),
             current_signers: vec![],
             next_signers: vec![],
-            cardano_transactions_signing_config: None,
         };
         let known_epoch = Epoch(4);
         runner

mithril-signer/tests/test_extensions/certificate_handler.rs

@@ -10,7 +10,7 @@ use mithril_common::{
         SignedEntityType, SignedEntityTypeDiscriminants, Signer, SingleSignature, TimePoint,
     },
     messages::AggregatorFeaturesMessage,
-    test::double::{Dummy, fake_data},
+    test::double::Dummy,
 };
 use mithril_ticker::{MithrilTickerService, TickerService};
 
@@ -57,15 +57,6 @@ impl FakeAggregator {
         signed_entity_config.allowed_discriminants = discriminants.clone();
     }
 
-    pub async fn change_transaction_signing_config(
-        &self,
-        transaction_signing_config: &CardanoTransactionsSigningConfig,
-    ) {
-        let mut signed_entity_config = self.signed_entity_config.write().await;
-        signed_entity_config.cardano_transactions_signing_config =
-            transaction_signing_config.clone();
-    }
-
     async fn get_time_point(&self) -> Result<TimePoint, AggregatorClientError> {
         let time_point = self
             .ticker_service
@@ -109,7 +100,6 @@ impl AggregatorClient for FakeAggregator {
             Ok(None)
         } else {
             let store = self.registered_signers.read().await;
-            let signed_entity_config = self.signed_entity_config.read().await;
             let time_point = self.get_time_point().await?;
             let current_signers = self.get_current_signers(&store).await?;
             let next_signers = self.get_next_signers(&store).await?;
@@ -118,10 +108,6 @@ impl AggregatorClient for FakeAggregator {
                 epoch: time_point.epoch,
                 current_signers,
                 next_signers,
-                registration_protocol_parameters: fake_data::protocol_parameters(),
-                cardano_transactions_signing_config: Some(
-                    signed_entity_config.cardano_transactions_signing_config.clone(),
-                ),
             }))
         }
     }
@@ -168,7 +154,7 @@ mod tests {
     use mithril_cardano_node_chain::chain_observer::ChainObserver;
     use mithril_cardano_node_chain::test::double::FakeChainObserver;
     use mithril_cardano_node_internal_database::test::double::DumbImmutableFileObserver;
-    use mithril_common::entities::{BlockNumber, ChainPoint};
+    use mithril_common::entities::ChainPoint;
     use mithril_common::test::double::fake_data;
 
     use super::*;
@@ -276,24 +262,6 @@ mod tests {
 
         assert_eq!(2, epoch_settings.current_signers.len());
         assert_eq!(1, epoch_settings.next_signers.len());
-
-        let new_transaction_signing_config = CardanoTransactionsSigningConfig {
-            security_parameter: BlockNumber(70),
-            step: BlockNumber(20),
-        };
-        fake_aggregator
-            .change_transaction_signing_config(&new_transaction_signing_config)
-            .await;
-
-        let epoch_settings = fake_aggregator
-            .retrieve_epoch_settings()
-            .await
-            .expect("we should have a result, None found!")
-            .expect("we should have an EpochSettings, None found!");
-        assert_eq!(
-            &Some(new_transaction_signing_config),
-            &epoch_settings.cardano_transactions_signing_config,
-        );
     }
 
     #[tokio::test]