Merge pull request #1913 from input-output-hk/ensemble/1897/signer_re…

…trieves_registrations_with_epoch_settings_route

Signer retrieves registrations with epoch settings route

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.60"
+version = "0.5.61"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/src/http_server/routes/epoch_routes.rs

@@ -22,9 +22,7 @@ fn epoch_settings(
 mod handlers {
     use crate::dependency_injection::EpochServiceWrapper;
     use crate::http_server::routes::reply;
-    use crate::ToEpochSettingsMessageAdapter;
-    use mithril_common::entities::EpochSettings;
-    use mithril_common::messages::ToMessageAdapter;
+    use mithril_common::messages::{EpochSettingsMessage, SignerMessagePart};
     use slog_scope::{debug, warn};
     use std::convert::Infallible;
     use warp::http::StatusCode;
@@ -40,17 +38,30 @@ mod handlers {
             epoch_service.epoch_of_current_data(),
             epoch_service.next_protocol_parameters(),
             epoch_service.upcoming_protocol_parameters(),
+            epoch_service.current_signers(),
+            epoch_service.next_signers(),
         ) {
-            (Ok(epoch), Ok(protocol_parameters), Ok(next_protocol_parameters)) => {
-                let epoch_settings = EpochSettings {
+            (
+                Ok(epoch),
+                Ok(protocol_parameters),
+                Ok(next_protocol_parameters),
+                Ok(current_signers),
+                Ok(next_signers),
+            ) => {
+                let epoch_settings_message = EpochSettingsMessage {
                     epoch,
                     protocol_parameters: protocol_parameters.clone(),
                     next_protocol_parameters: next_protocol_parameters.clone(),
+                    current_signers: SignerMessagePart::from_signers(current_signers.to_vec()),
+                    next_signers: SignerMessagePart::from_signers(next_signers.to_vec()),
                 };
-                let epoch_settings_message = ToEpochSettingsMessageAdapter::adapt(epoch_settings);
                 Ok(reply::json(&epoch_settings_message, StatusCode::OK))
             }
-            (Err(err), _, _) | (_, Err(err), _) | (_, _, Err(err)) => {
+            (Err(err), _, _, _, _)
+            | (_, Err(err), _, _, _)
+            | (_, _, Err(err), _, _)
+            | (_, _, _, Err(err), _)
+            | (_, _, _, _, Err(err)) => {
                 warn!("epoch_settings::error"; "error" => ?err);
                 Ok(reply::server_error(err))
             }

mithril-aggregator/src/lib.rs

@@ -37,9 +37,7 @@ pub use crate::configuration::{
 pub use crate::multi_signer::{MultiSigner, MultiSignerImpl};
 pub use commands::{CommandType, MainOpts};
 pub use dependency_injection::DependencyContainer;
-pub use message_adapters::{
-    FromRegisterSignerAdapter, ToCertificatePendingMessageAdapter, ToEpochSettingsMessageAdapter,
-};
+pub use message_adapters::{FromRegisterSignerAdapter, ToCertificatePendingMessageAdapter};
 pub use runtime::{
     AggregatorConfig, AggregatorRunner, AggregatorRunnerTrait, AggregatorRuntime, RuntimeError,
 };

mithril-aggregator/src/message_adapters/mod.rs

@@ -6,7 +6,6 @@ mod to_cardano_transaction_list_message;
 mod to_cardano_transaction_message;
 mod to_cardano_transactions_proof_message;
 mod to_certificate_pending_message;
-mod to_epoch_settings_message;
 mod to_mithril_stake_distribution_list_message;
 mod to_mithril_stake_distribution_message;
 mod to_snapshot_list_message;
@@ -24,7 +23,6 @@ pub use to_cardano_transaction_list_message::ToCardanoTransactionListMessageAdap
 pub use to_cardano_transaction_message::ToCardanoTransactionMessageAdapter;
 pub use to_cardano_transactions_proof_message::ToCardanoTransactionsProofsMessageAdapter;
 pub use to_certificate_pending_message::ToCertificatePendingMessageAdapter;
-pub use to_epoch_settings_message::ToEpochSettingsMessageAdapter;
 #[cfg(test)]
 pub use to_mithril_stake_distribution_list_message::ToMithrilStakeDistributionListMessageAdapter;
 #[cfg(test)]

mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs

@@ -1,6 +1,6 @@
 use mithril_common::entities::CardanoDbBeacon;
 use mithril_common::{
-    entities::{CertificatePending, SignedEntityType, Signer},
+    entities::{CertificatePending, SignedEntityType},
     messages::{CertificatePendingMessage, SignerMessagePart},
 };
 
@@ -23,31 +23,12 @@ impl ToCertificatePendingMessageAdapter {
             signed_entity_type: certificate_pending.signed_entity_type,
             protocol_parameters: certificate_pending.protocol_parameters,
             next_protocol_parameters: certificate_pending.next_protocol_parameters,
-            signers: Self::adapt_signers(certificate_pending.signers),
-            next_signers: Self::adapt_signers(certificate_pending.next_signers),
+            signers: SignerMessagePart::from_signers(certificate_pending.signers),
+            next_signers: SignerMessagePart::from_signers(certificate_pending.next_signers),
         }
     }
 }
 
-impl ToCertificatePendingMessageAdapter {
-    fn adapt_signers(signers: Vec<Signer>) -> Vec<SignerMessagePart> {
-        signers
-            .into_iter()
-            .map(|signer| SignerMessagePart {
-                party_id: signer.party_id,
-                verification_key: signer.verification_key.try_into().unwrap(),
-                verification_key_signature: signer
-                    .verification_key_signature
-                    .map(|k| k.try_into().unwrap()),
-                kes_period: signer.kes_period,
-                operational_certificate: signer
-                    .operational_certificate
-                    .map(|o| o.try_into().unwrap()),
-            })
-            .collect()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use mithril_common::{
@@ -95,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();