Move signature_publisher module to services

mithril-signer/src/dependency_injection/builder.rs

@@ -37,15 +37,15 @@ use mithril_persistence::store::StakeStore;
 
 use crate::dependency_injection::SignerDependencyContainer;
 use crate::services::{
-    AggregatorHTTPClient, CardanoTransactionsImporter,
+    AggregatorHTTPClient, AggregatorHttpSignaturePublisher, CardanoTransactionsImporter,
     CardanoTransactionsPreloaderActivationSigner, MithrilEpochService, MithrilSingleSigner,
-    SignerSignableSeedBuilder, SignerUpkeepService, TransactionsImporterByChunk,
-    TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
+    SignaturePublisher, SignerSignableSeedBuilder, SignerUpkeepService,
+    TransactionsImporterByChunk, TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
+    UnixSocketSignaturePublisher,
 };
 use crate::store::{MKTreeStoreSqlite, ProtocolInitializerStore};
 use crate::{
-    AggregatorHttpSignaturePublisher, Configuration, MetricsService, SignaturePublisher,
-    UnixSocketSignaturePublisher, HTTP_REQUEST_TIMEOUT_DURATION, SQLITE_FILE,
+    Configuration, MetricsService, HTTP_REQUEST_TIMEOUT_DURATION, SQLITE_FILE,
     SQLITE_FILE_CARDANO_TRANSACTION,
 };
 

mithril-signer/src/dependency_injection/containers.rs

@@ -11,9 +11,11 @@ use mithril_common::TickerService;
 use mithril_persistence::store::StakeStore;
 use tokio::sync::RwLock;
 
-use crate::services::{AggregatorClient, EpochService, SingleSigner, UpkeepService};
+use crate::services::{
+    AggregatorClient, EpochService, SignaturePublisher, SingleSigner, UpkeepService,
+};
 use crate::store::ProtocolInitializerStorer;
-use crate::{MetricsService, SignaturePublisher};
+use crate::MetricsService;
 
 type StakeStoreService = Arc<StakeStore>;
 type CertificateHandlerService = Arc<dyn AggregatorClient>;

mithril-signer/src/lib.rs

@@ -14,7 +14,6 @@ mod message_adapters;
 pub mod metrics;
 mod runtime;
 pub mod services;
-mod signature_publisher;
 pub mod store;
 
 pub use configuration::{Configuration, DefaultConfiguration};
@@ -24,7 +23,6 @@ pub use message_adapters::{
 };
 pub use metrics::*;
 pub use runtime::*;
-pub use signature_publisher::*;
 
 /// HTTP request timeout duration in milliseconds
 const HTTP_REQUEST_TIMEOUT_DURATION: u64 = 30000;

mithril-signer/src/runtime/runner.rs

@@ -452,12 +452,11 @@ mod tests {
 
     use crate::metrics::MetricsService;
     use crate::services::{
-        CardanoTransactionsImporter, DumbAggregatorClient, MithrilEpochService,
-        MithrilSingleSigner, MockTransactionStore, MockUpkeepService, SignerSignableSeedBuilder,
-        SingleSigner,
+        AggregatorHttpSignaturePublisher, CardanoTransactionsImporter, DumbAggregatorClient,
+        MithrilEpochService, MithrilSingleSigner, MockSignaturePublisher, MockTransactionStore,
+        MockUpkeepService, SignerSignableSeedBuilder, SingleSigner,
     };
     use crate::store::ProtocolInitializerStore;
-    use crate::{AggregatorHttpSignaturePublisher, MockSignaturePublisher};
 
     use super::*;
 

mithril-signer/src/services/mod.rs

@@ -13,6 +13,7 @@ mod aggregator_client;
 mod cardano_transactions;
 mod epoch_service;
 mod signable_builder;
+mod signature_publisher;
 mod single_signer;
 mod upkeep_service;
 
@@ -22,5 +23,6 @@ pub use aggregator_client::*;
 pub use cardano_transactions::*;
 pub use epoch_service::*;
 pub use signable_builder::*;
+pub use signature_publisher::*;
 pub use single_signer::*;
 pub use upkeep_service::*;

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

@@ -3,8 +3,7 @@ use mithril_common::entities::{ProtocolMessage, SignedEntityType, SingleSignatur
 use mithril_common::StdResult;
 use std::sync::Arc;
 
-use crate::services::AggregatorClient;
-use crate::SignaturePublisher;
+use crate::services::{AggregatorClient, SignaturePublisher};
 
 /// Publishes computed single signatures to an Aggregator http api.
 pub struct AggregatorHttpSignaturePublisher {

mithril-signer/src/signature_publisher/unix_socket.rs → mithril-signer/src/services/signature_publisher/unix_socket.rs

@@ -6,7 +6,7 @@ use mithril_common::StdResult;
 use std::path::{Path, PathBuf};
 
 use crate::message_adapters::ToRegisterSignatureMessageAdapter;
-use crate::SignaturePublisher;
+use crate::services::SignaturePublisher;
 
 /// Publishes computed single signatures to a third party using unix socket.
 pub struct UnixSocketSignaturePublisher {

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -31,12 +31,11 @@ use mithril_signer::{
     dependency_injection::{DependenciesBuilder, SignerDependencyContainer},
     metrics::*,
     services::{
-        AggregatorClient, CardanoTransactionsImporter, MithrilEpochService, MithrilSingleSigner,
-        SignerSignableSeedBuilder, SignerUpkeepService,
+        AggregatorClient, AggregatorHttpSignaturePublisher, CardanoTransactionsImporter,
+        MithrilEpochService, MithrilSingleSigner, SignerSignableSeedBuilder, SignerUpkeepService,
     },
     store::{MKTreeStoreSqlite, ProtocolInitializerStore, ProtocolInitializerStorer},
-    AggregatorHttpSignaturePublisher, Configuration, MetricsService, RuntimeError, SignerRunner,
-    SignerState, StateMachine,
+    Configuration, MetricsService, RuntimeError, SignerRunner, SignerState, StateMachine,
 };
 use prometheus_parse::Value;
 use slog::Drain;