Move send_signer_registration_event to TransmitterService to keep handlers private

Author: sfauvel

mithril-aggregator/src/event_store/database/repository.rs

@@ -153,7 +153,6 @@ mod tests {
         use crate::event_store::{
             database::test_helper::event_store_db_connection, TransmitterService,
         };
-        use crate::http_server::routes::signer_routes;
         use crate::test_tools::TestLogger;
         use mithril_common::entities::Stake;
         use mithril_common::{entities::SignerWithStake, test_utils::fake_data, StdResult};
@@ -179,8 +178,8 @@ mod tests {
                 ..signers[0].clone()
             };
 
-            let _ = signer_routes::handlers::send_registration_event(
-                &transmitter_service,
+            let _ = transmitter_service.send_signer_registration_event(
+                "Test",
                 &signer,
                 Some(signer_node_version.to_string()),
                 epoch,

mithril-aggregator/src/event_store/transmitter_service.rs

@@ -3,7 +3,7 @@ use slog::{warn, Logger};
 use std::fmt::Debug;
 use tokio::sync::mpsc::UnboundedSender;
 
-use mithril_common::logging::LoggerExtensions;
+use mithril_common::{entities::SignerWithStake, logging::LoggerExtensions};
 
 use super::EventMessage;
 
@@ -69,4 +69,29 @@ impl TransmitterService<EventMessage> {
             error_msg
         })
     }
+
+    /// Send signer registration event.
+    pub fn send_signer_registration_event(
+        &self,
+        source: &str,
+        signer_with_stake: &SignerWithStake,
+        signer_node_version: Option<String>,
+        epoch_str: &str,
+    ) -> Result<(), String> {
+        let mut headers: Vec<(&str, &str)> = match signer_node_version.as_ref() {
+            Some(version) => vec![("signer-node-version", version)],
+            None => Vec::new(),
+        };
+
+        if !epoch_str.is_empty() {
+            headers.push(("epoch", epoch_str));
+        }
+
+        self.send_event_message::<SignerWithStake>(
+            source,
+            "register_signer",
+            signer_with_stake,
+            headers,
+        )
+    }
 }

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

@@ -7,7 +7,7 @@ pub(crate) mod reply;
 mod root_routes;
 pub mod router;
 mod signatures_routes;
-pub(crate) mod signer_routes;
+mod signer_routes;
 mod statistics_routes;
 
 /// Match the given result and do an early return with an internal server error (500)

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

@@ -90,7 +90,7 @@ async fn compute_registration_epoch(
     }
 }
 
-pub(crate) mod handlers {
+mod handlers {
     use crate::database::repository::SignerGetter;
     use crate::dependency_injection::EpochServiceWrapper;
     use crate::entities::{
@@ -102,36 +102,12 @@ pub(crate) mod handlers {
     };
     use crate::{http_server::routes::reply, SignerRegisterer, SignerRegistrationError};
     use crate::{FromRegisterSignerAdapter, MetricsService, VerificationKeyStorer};
-    use mithril_common::entities::SignerWithStake;
     use mithril_common::messages::{RegisterSignerMessage, TryFromMessageAdapter};
     use slog::{debug, warn, Logger};
     use std::convert::Infallible;
     use std::sync::Arc;
     use warp::http::StatusCode;
 
-    pub(crate) fn send_registration_event(
-        transmitter: &TransmitterService<EventMessage>,
-        signer_with_stake: &SignerWithStake,
-        signer_node_version: Option<String>,
-        epoch_str: &str,
-    ) -> Result<(), String> {
-        let mut headers: Vec<(&str, &str)> = match signer_node_version.as_ref() {
-            Some(version) => vec![("signer-node-version", version)],
-            None => Vec::new(),
-        };
-
-        if !epoch_str.is_empty() {
-            headers.push(("epoch", epoch_str));
-        }
-
-        transmitter.send_event_message::<SignerWithStake>(
-            "HTTP::signer_register",
-            "register_signer",
-            signer_with_stake,
-            headers,
-        )
-    }
-
     /// Register Signer
     pub async fn register_signer(
         signer_node_version: Option<String>,
@@ -168,8 +144,8 @@ pub(crate) mod handlers {
             .await
         {
             Ok(signer_with_stake) => {
-                let _ = send_registration_event(
-                    &event_transmitter,
+                let _ = event_transmitter.send_signer_registration_event(
+                    "HTTP::signer_register",
                     &signer_with_stake,
                     signer_node_version,
                     epoch_str.as_str(),
@@ -180,8 +156,8 @@ pub(crate) mod handlers {
             Err(SignerRegistrationError::ExistingSigner(signer_with_stake)) => {
                 debug!(logger, "register_signer::already_registered");
 
-                let _ = send_registration_event(
-                    &event_transmitter,
+                let _ = event_transmitter.send_signer_registration_event(
+                    "HTTP::signer_register",
                     &signer_with_stake,
                     signer_node_version,
                     epoch_str.as_str(),