refactor(signer): unify signers registration publisher and retriever in the same parent module

and split the retriever in several modules like the publisher

Author: Alenar

mithril-signer/src/services/mod.rs

@@ -15,7 +15,6 @@ mod epoch_service;
 mod signable_builder;
 mod signature_publisher;
 mod signer_registration;
-mod signers_registration_retriever;
 mod single_signer;
 mod upkeep_service;
 
@@ -25,8 +24,5 @@ pub use epoch_service::*;
 pub use signable_builder::*;
 pub use signature_publisher::*;
 pub use signer_registration::*;
-#[cfg(test)]
-pub(crate) use signers_registration_retriever::dumb::DumbSignersRegistrationRetriever;
-pub use signers_registration_retriever::*;
 pub use single_signer::*;
 pub use upkeep_service::*;

mithril-signer/src/services/signer_registration/mod.rs

@@ -1,8 +1,5 @@
-mod http;
-mod interface;
-#[cfg(test)]
-mod spy;
+mod publisher;
+mod retriever;
 
-pub use interface::*;
-#[cfg(test)]
-pub use spy::*;
+pub use publisher::*;
+pub use retriever::*;

mithril-signer/src/services/signer_registration/http.rs renamed to mithril-signer/src/services/signer_registration/publisher/http.rs

@@ -0,0 +1,8 @@
+mod http;
+mod interface;
+#[cfg(test)]
+mod spy;
+
+pub use interface::*;
+#[cfg(test)]
+pub use spy::*;

mithril-signer/src/services/signer_registration/interface.rs renamed to mithril-signer/src/services/signer_registration/publisher/interface.rs

@@ -0,0 +1,29 @@
+use tokio::sync::RwLock;
+
+use mithril_common::StdResult;
+use mithril_common::test::double::Dummy;
+
+use crate::RegisteredSigners;
+use crate::services::signer_registration::retriever::interface::SignersRegistrationRetriever;
+
+/// Dumb `SignersRegistrationRetriever` implementation for testing
+pub struct DumbSignersRegistrationRetriever {
+    epoch_settings: RwLock<Option<RegisteredSigners>>,
+}
+
+impl Default for DumbSignersRegistrationRetriever {
+    fn default() -> Self {
+        Self {
+            epoch_settings: RwLock::new(Some(RegisteredSigners::dummy())),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl SignersRegistrationRetriever for DumbSignersRegistrationRetriever {
+    async fn retrieve_all_signer_registrations(&self) -> StdResult<Option<RegisteredSigners>> {
+        let epoch_settings = self.epoch_settings.read().await.clone();
+
+        Ok(epoch_settings)
+    }
+}

mithril-signer/src/services/signer_registration/publisher/mod.rs

@@ -0,0 +1,15 @@
+use mithril_aggregator_client::{AggregatorHttpClient, query::GetEpochSettingsQuery};
+use mithril_common::{StdResult, messages::TryFromMessageAdapter};
+
+use crate::services::SignersRegistrationRetriever;
+use crate::{FromEpochSettingsAdapter, RegisteredSigners};
+
+#[async_trait::async_trait]
+impl SignersRegistrationRetriever for AggregatorHttpClient {
+    async fn retrieve_all_signer_registrations(&self) -> StdResult<Option<RegisteredSigners>> {
+        let message = self.send(GetEpochSettingsQuery::current()).await?;
+        let epoch_settings = FromEpochSettingsAdapter::try_adapt(message)?;
+
+        Ok(Some(epoch_settings))
+    }
+}

mithril-signer/src/services/signer_registration/spy.rs renamed to mithril-signer/src/services/signer_registration/publisher/spy.rs

@@ -0,0 +1,11 @@
+use mithril_common::StdResult;
+
+use crate::RegisteredSigners;
+
+/// Service responsible for retrieving the signer's registration from the mithril network
+#[cfg_attr(test, mockall::automock)]
+#[async_trait::async_trait]
+pub trait SignersRegistrationRetriever: Sync + Send {
+    /// Retrieves signer's registration from the mithril network
+    async fn retrieve_all_signer_registrations(&self) -> StdResult<Option<RegisteredSigners>>;
+}

mithril-signer/src/services/signer_registration/retriever/dumb.rs

@@ -0,0 +1,8 @@
+#[cfg(test)]
+mod dumb;
+mod http;
+mod interface;
+
+#[cfg(test)]
+pub use dumb::*;
+pub use interface::*;