Move functions from Runner trait to the implementation and fix PR remarks

Author: sfauvel

mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs

@@ -76,6 +76,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(deprecated)]
     fn adapt_signers() {
         let fake_signers = fake_data::signers(5);
         let signers = fake_signers[1..3].to_vec();

mithril-common/src/messages/epoch_settings.rs

@@ -15,6 +15,7 @@ pub struct EpochSettingsMessage {
     /// Next Protocol parameters
     #[serde(rename = "next_protocol")]
     pub next_protocol_parameters: ProtocolParameters,
+
     /// Current Signers
     pub current_signers: Vec<SignerMessagePart>,
 

mithril-common/src/messages/message_parts/signer.rs

@@ -182,7 +182,7 @@ impl SignerMessagePart {
     pub fn try_into_signers(messages: Vec<Self>) -> StdResult<Vec<Signer>> {
         messages
             .into_iter()
-            .map(|m| SignerMessagePart::try_into(m))
+            .map(SignerMessagePart::try_into)
             .collect()
     }
 

mithril-signer/src/runtime/runner.rs

@@ -30,19 +30,6 @@ pub trait Runner: Send + Sync {
     /// Fetch the current time point from the Cardano node.
     async fn get_current_time_point(&self) -> StdResult<TimePoint>;
 
-    /// Get the current signers.
-    /// // TODO return a &Vec
-    async fn get_current_signers(&self) -> StdResult<Vec<Signer>>;
-
-    /// Get the next signers.
-    async fn get_next_signers(&self) -> StdResult<Vec<Signer>>;
-
-    /// Get the next signers with their stake.
-    async fn get_current_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>>;
-
-    /// Get the next signers with their stake.
-    async fn get_next_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>>;
-
     /// Register the signer verification key to the aggregator.
     async fn register_signer_to_aggregator(&self) -> StdResult<()>;
 
@@ -110,6 +97,26 @@ impl SignerRunner {
     pub fn new(config: Configuration, services: SignerDependencyContainer) -> Self {
         Self { services, config }
     }
+
+    /// Get the current signers with their stake.
+    async fn get_current_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>> {
+        self.services
+            .epoch_service
+            .read()
+            .await
+            .current_signers_with_stake()
+            .await
+    }
+
+    /// Get the next signers with their stake.
+    async fn get_next_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>> {
+        self.services
+            .epoch_service
+            .read()
+            .await
+            .next_signers_with_stake()
+            .await
+    }
 }
 
 #[cfg_attr(test, automock)]
@@ -145,48 +152,6 @@ impl Runner for SignerRunner {
             .with_context(|| "Runner can not get current time point")
     }
 
-    async fn get_current_signers(&self) -> StdResult<Vec<Signer>> {
-        debug!("RUNNER: get_current_signers");
-
-        self.services
-            .epoch_service
-            .read()
-            .await
-            .current_signers()
-            .cloned()
-    }
-
-    async fn get_next_signers(&self) -> StdResult<Vec<Signer>> {
-        debug!("RUNNER: get_next_signers");
-
-        self.services
-            .epoch_service
-            .read()
-            .await
-            .next_signers()
-            .cloned()
-    }
-
-    /// Get the current signers with their stake.
-    async fn get_current_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>> {
-        self.services
-            .epoch_service
-            .read()
-            .await
-            .current_signers_with_stake()
-            .await
-    }
-
-    /// Get the next signers with their stake.
-    async fn get_next_signers_with_stake(&self) -> StdResult<Vec<SignerWithStake>> {
-        self.services
-            .epoch_service
-            .read()
-            .await
-            .next_signers_with_stake()
-            .await
-    }
-
     async fn register_signer_to_aggregator(&self) -> StdResult<()> {
         debug!("RUNNER: register_signer_to_aggregator");
 

mithril-signer/src/services/epoch_service.rs

@@ -18,7 +18,7 @@ use crate::RunnerError;
 #[derive(Debug, Error)]
 pub enum EpochServiceError {
     /// Raised when service has not collected data at least once.
-    #[error("Epoch service was not initialized, the function `inform_epoch` must be called first")]
+    #[error("Epoch service was not initialized, the function `inform_epoch_settings` must be called first")]
     NotYetInitialized,
 }
 
@@ -108,6 +108,7 @@ impl MithrilEpochService {
 
         Ok(signers_with_stake)
     }
+
     fn unwrap_data(&self) -> Result<&EpochData, EpochServiceError> {
         self.epoch_data
             .as_ref()