refactor: move SignaturePublisher to a dedicated module

Author: Clément TURMEL

mithril-signer/src/dependency_injection/builder.rs

@@ -41,9 +41,9 @@ use crate::dependency_injection::SignerDependencyContainer;
 use crate::services::{
     AggregatorHTTPClient, CardanoTransactionsImporter,
     CardanoTransactionsPreloaderActivationSigner, MithrilEpochService, MithrilSingleSigner,
-    SignerCertifierService, SignerSignableSeedBuilder, SignerSignedEntityConfigProvider,
-    SignerUpkeepService, TransactionsImporterByChunk, TransactionsImporterWithPruner,
-    TransactionsImporterWithVacuum,
+    SignaturePublisher, SignerCertifierService, SignerSignableSeedBuilder,
+    SignerSignedEntityConfigProvider, SignerUpkeepService, TransactionsImporterByChunk,
+    TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
 };
 use crate::store::MKTreeStoreSqlite;
 use crate::{
@@ -385,12 +385,15 @@ impl<'a> DependenciesBuilder<'a> {
             ],
             self.root_logger(),
         ));
+
+        let signature_publisher: Arc<dyn SignaturePublisher> = aggregator_client.clone();
+
         let certifier = Arc::new(SignerCertifierService::new(
             signed_beacon_repository,
             Arc::new(SignerSignedEntityConfigProvider::new(epoch_service.clone())),
             signed_entity_type_lock.clone(),
             single_signer.clone(),
-            aggregator_client.clone(),
+            signature_publisher,
             self.root_logger(),
         ));
 

mithril-signer/src/services/aggregator_client.rs

@@ -16,14 +16,13 @@ use mithril_common::{
     messages::{
         AggregatorFeaturesMessage, EpochSettingsMessage, TryFromMessageAdapter, TryToMessageAdapter,
     },
-    StdError, StdResult, MITHRIL_API_VERSION_HEADER, MITHRIL_SIGNER_VERSION_HEADER,
+    StdError, MITHRIL_API_VERSION_HEADER, MITHRIL_SIGNER_VERSION_HEADER,
 };
 
 use crate::entities::SignerEpochSettings;
 use crate::message_adapters::{
     FromEpochSettingsAdapter, ToRegisterSignatureMessageAdapter, ToRegisterSignerMessageAdapter,
 };
-use crate::services::SignaturePublisher;
 
 const JSON_CONTENT_TYPE: HeaderValue = HeaderValue::from_static("application/json");
 
@@ -172,20 +171,6 @@ pub trait AggregatorClient: Sync + Send {
     ) -> Result<AggregatorFeaturesMessage, AggregatorClientError>;
 }
 
-#[async_trait]
-impl<T: AggregatorClient> SignaturePublisher for T {
-    async fn publish(
-        &self,
-        signed_entity_type: &SignedEntityType,
-        signatures: &SingleSignatures,
-        protocol_message: &ProtocolMessage,
-    ) -> StdResult<()> {
-        self.register_signatures(signed_entity_type, signatures, protocol_message)
-            .await?;
-        Ok(())
-    }
-}
-
 /// AggregatorHTTPClient is a http client for an aggregator
 pub struct AggregatorHTTPClient {
     aggregator_endpoint: String,

mithril-signer/src/services/certifier.rs

@@ -3,15 +3,13 @@ use chrono::Utc;
 use slog::{debug, Logger};
 use std::sync::Arc;
 
-use mithril_common::entities::{
-    ProtocolMessage, SignedEntityConfig, SignedEntityType, SingleSignatures, TimePoint,
-};
+use mithril_common::entities::{ProtocolMessage, SignedEntityConfig, SignedEntityType, TimePoint};
 use mithril_common::logging::LoggerExtensions;
 use mithril_common::StdResult;
 use mithril_signed_entity_lock::SignedEntityTypeLock;
 
 use crate::entities::BeaconToSign;
-use crate::services::SingleSigner;
+use crate::services::{SignaturePublisher, SingleSigner};
 
 /// Certifier Service
 ///
@@ -54,19 +52,6 @@ pub trait SignedBeaconStore: Sync + Send {
     async fn mark_beacon_as_signed(&self, entity: &BeaconToSign) -> StdResult<()>;
 }
 
-/// Publishes computed single signatures to a third party.
-#[cfg_attr(test, mockall::automock)]
-#[async_trait]
-pub trait SignaturePublisher: Send + Sync {
-    /// Publish computed single signatures.
-    async fn publish(
-        &self,
-        signed_entity_type: &SignedEntityType,
-        signatures: &SingleSignatures,
-        protocol_message: &ProtocolMessage,
-    ) -> StdResult<()>;
-}
-
 /// Implementation of the [Certifier Service][CertifierService] for the Mithril Signer.
 pub struct SignerCertifierService {
     signed_beacon_store: Arc<dyn SignedBeaconStore>,
@@ -177,7 +162,7 @@ mod tests {
     };
     use mithril_common::test_utils::fake_data;
 
-    use crate::services::MockSingleSigner;
+    use crate::services::{MockSignaturePublisher, MockSingleSigner};
 
     use super::{tests::tests_tooling::*, *};
 

mithril-signer/src/services/mod.rs

@@ -14,6 +14,7 @@ mod cardano_transactions;
 mod certifier;
 mod epoch_service;
 mod signable_builder;
+mod signature_publisher;
 mod single_signer;
 mod upkeep_service;
 
@@ -24,5 +25,6 @@ pub use cardano_transactions::*;
 pub use certifier::*;
 pub use epoch_service::*;
 pub use signable_builder::*;
+pub use signature_publisher::*;
 pub use single_signer::*;
 pub use upkeep_service::*;

mithril-signer/src/services/signature_publisher/http.rs

@@ -0,0 +1,21 @@
+use async_trait::async_trait;
+use mithril_common::entities::{ProtocolMessage, SignedEntityType, SingleSignatures};
+use mithril_common::StdResult;
+
+use crate::services::AggregatorClient;
+
+use super::SignaturePublisher;
+
+#[async_trait]
+impl<T: AggregatorClient> SignaturePublisher for T {
+    async fn publish(
+        &self,
+        signed_entity_type: &SignedEntityType,
+        signature: &SingleSignatures,
+        protocol_message: &ProtocolMessage,
+    ) -> StdResult<()> {
+        self.register_signatures(signed_entity_type, signature, protocol_message)
+            .await?;
+        Ok(())
+    }
+}

mithril-signer/src/services/signature_publisher/interface.rs

@@ -0,0 +1,16 @@
+use async_trait::async_trait;
+use mithril_common::entities::{ProtocolMessage, SignedEntityType, SingleSignatures};
+use mithril_common::StdResult;
+
+/// Publishes computed single signature to a third party.
+#[cfg_attr(test, mockall::automock)]
+#[async_trait]
+pub trait SignaturePublisher: Send + Sync {
+    /// Publish computed single signature.
+    async fn publish(
+        &self,
+        signed_entity_type: &SignedEntityType,
+        signature: &SingleSignatures,
+        protocol_message: &ProtocolMessage,
+    ) -> StdResult<()>;
+}

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

@@ -0,0 +1,4 @@
+mod http;
+mod interface;
+
+pub use interface::*;