feat: adapt signer with the new message structure

Author: dlachaume

mithril-common/src/entities/epoch_settings.rs

@@ -21,5 +21,8 @@ pub struct EpochSettings {
     pub next_signers: Vec<Signer>,
 
     /// Cardano transactions signing configuration for the current epoch
-    pub current_cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
+    pub cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
+
+    /// Cardano transactions signing configuration for the next epoch
+    pub next_cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
 }

mithril-common/src/test_utils/fake_data.rs

@@ -66,8 +66,10 @@ pub fn epoch_settings() -> entities::EpochSettings {
     let current_signers = signers[1..3].to_vec();
     let next_signers = signers[2..5].to_vec();
 
-    // Cardano transactions signing configuration for the current epoch
-    let current_cardano_transactions_signing_config =
+    // Cardano transactions signing configuration
+    let cardano_transactions_signing_config =
+        Some(entities::CardanoTransactionsSigningConfig::dummy());
+    let next_cardano_transactions_signing_config =
         Some(entities::CardanoTransactionsSigningConfig::dummy());
 
     // Epoch settings
@@ -77,7 +79,8 @@ pub fn epoch_settings() -> entities::EpochSettings {
         next_protocol_parameters,
         current_signers,
         next_signers,
-        current_cardano_transactions_signing_config,
+        cardano_transactions_signing_config,
+        next_cardano_transactions_signing_config,
     }
 }
 

mithril-signer/src/message_adapters/from_epoch_settings.rs

@@ -19,8 +19,9 @@ impl TryFromMessageAdapter<EpochSettingsMessage, EpochSettings> for FromEpochSet
                 .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")?,
-            current_cardano_transactions_signing_config: message
-                .current_cardano_transactions_signing_config,
+            cardano_transactions_signing_config: message.cardano_transactions_signing_config,
+            next_cardano_transactions_signing_config: message
+                .next_cardano_transactions_signing_config,
         };
         Ok(epoch_settings)
     }

mithril-signer/src/runtime/runner.rs

@@ -548,7 +548,12 @@ mod tests {
         async fn next_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>> {
             Ok(vec![])
         }
-        fn current_cardano_transactions_signing_config(
+        fn cardano_transactions_signing_config(
+            &self,
+        ) -> StdResult<&Option<CardanoTransactionsSigningConfig>> {
+            Ok(&None)
+        }
+        fn next_cardano_transactions_signing_config(
             &self,
         ) -> StdResult<&Option<CardanoTransactionsSigningConfig>> {
             Ok(&None)

mithril-signer/src/runtime/state_machine.rs

@@ -548,7 +548,8 @@ mod tests {
             next_protocol_parameters: fake_data::protocol_parameters(),
             current_signers: vec![],
             next_signers: vec![],
-            current_cardano_transactions_signing_config: None,
+            cardano_transactions_signing_config: None,
+            next_cardano_transactions_signing_config: None,
         };
         let known_epoch = Epoch(4);
         runner

mithril-signer/src/services/epoch_service.rs

@@ -51,7 +51,12 @@ pub trait EpochService: Sync + Send {
     async fn next_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>>;
 
     /// Get the cardano transactions signing configuration for the current epoch
-    fn current_cardano_transactions_signing_config(
+    fn cardano_transactions_signing_config(
+        &self,
+    ) -> StdResult<&Option<CardanoTransactionsSigningConfig>>;
+
+    /// Get the cardano transactions signing configuration for the next epoch
+    fn next_cardano_transactions_signing_config(
         &self,
     ) -> StdResult<&Option<CardanoTransactionsSigningConfig>>;
 
@@ -68,7 +73,8 @@ struct EpochData {
     next_protocol_parameters: ProtocolParameters,
     current_signers: Vec<Signer>,
     next_signers: Vec<Signer>,
-    current_cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
+    cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
+    next_cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
 }
 
 /// Implementation of the [epoch service][EpochService].
@@ -145,8 +151,9 @@ impl EpochService for MithrilEpochService {
             next_protocol_parameters: epoch_settings.next_protocol_parameters,
             current_signers: epoch_settings.current_signers,
             next_signers: epoch_settings.next_signers,
-            current_cardano_transactions_signing_config: epoch_settings
-                .current_cardano_transactions_signing_config,
+            cardano_transactions_signing_config: epoch_settings.cardano_transactions_signing_config,
+            next_cardano_transactions_signing_config: epoch_settings
+                .next_cardano_transactions_signing_config,
         });
 
         Ok(())
@@ -186,12 +193,16 @@ impl EpochService for MithrilEpochService {
         .await
     }
 
-    fn current_cardano_transactions_signing_config(
+    fn cardano_transactions_signing_config(
+        &self,
+    ) -> StdResult<&Option<CardanoTransactionsSigningConfig>> {
+        Ok(&self.unwrap_data()?.cardano_transactions_signing_config)
+    }
+
+    fn next_cardano_transactions_signing_config(
         &self,
     ) -> StdResult<&Option<CardanoTransactionsSigningConfig>> {
-        Ok(&self
-            .unwrap_data()?
-            .current_cardano_transactions_signing_config)
+        Ok(&self.unwrap_data()?.next_cardano_transactions_signing_config)
     }
 
     fn is_signer_included_in_current_stake_distribution(
@@ -319,9 +330,8 @@ mod tests {
         assert!(service.next_signers().is_err());
         assert!(service.current_signers_with_stake().await.is_err());
         assert!(service.next_signers_with_stake().await.is_err());
-        assert!(service
-            .current_cardano_transactions_signing_config()
-            .is_err());
+        assert!(service.cardano_transactions_signing_config().is_err());
+        assert!(service.next_cardano_transactions_signing_config().is_err());
     }
 
     #[test]
@@ -371,13 +381,16 @@ mod tests {
             *service.next_protocol_parameters().unwrap()
         );
 
-        // Check current_cardano_transactions_signing_config
+        // Check cardano_transactions_signing_config
         assert_eq!(
-            epoch_settings.current_cardano_transactions_signing_config,
-            *service
-                .current_cardano_transactions_signing_config()
-                .unwrap()
-        )
+            epoch_settings.cardano_transactions_signing_config,
+            *service.cardano_transactions_signing_config().unwrap()
+        );
+        // Check next_cardano_transactions_signing_config
+        assert_eq!(
+            epoch_settings.next_cardano_transactions_signing_config,
+            *service.next_cardano_transactions_signing_config().unwrap()
+        );
     }
 
     #[tokio::test]