Move signature_publisher module to services

mithril-signer/src/dependency_injection/builder.rs

@@ -36,14 +36,14 @@ use mithril_persistence::store::StakeStore;
 
 use crate::dependency_injection::SignerDependencyContainer;
 use crate::services::{
-    AggregatorHTTPClient, CardanoTransactionsImporter,
-    CardanoTransactionsPreloaderActivationSigner, MithrilSingleSigner, SignerUpkeepService,
-    TransactionsImporterByChunk, TransactionsImporterWithPruner, TransactionsImporterWithVacuum,
+    AggregatorHTTPClient, AggregatorHttpSignaturePublisher, CardanoTransactionsImporter,
+    CardanoTransactionsPreloaderActivationSigner, MithrilSingleSigner, SignaturePublisher,
+    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

@@ -10,9 +10,9 @@ use mithril_common::signed_entity_type_lock::SignedEntityTypeLock;
 use mithril_common::TickerService;
 use mithril_persistence::store::StakeStore;
 
-use crate::services::{AggregatorClient, SingleSigner, UpkeepService};
+use crate::services::{AggregatorClient, 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

@@ -13,7 +13,6 @@ mod message_adapters;
 pub mod metrics;
 mod runtime;
 pub mod services;
-mod signature_publisher;
 pub mod store;
 
 pub use configuration::{Configuration, DefaultConfiguration};
@@ -22,7 +21,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

@@ -467,11 +467,11 @@ impl Runner for SignerRunner {
 mod tests {
     use crate::metrics::MetricsService;
     use crate::services::{
-        AggregatorClient, CardanoTransactionsImporter, DumbAggregatorClient, MithrilSingleSigner,
-        MockTransactionStore, MockUpkeepService, SingleSigner,
+        AggregatorClient, AggregatorHttpSignaturePublisher, CardanoTransactionsImporter,
+        DumbAggregatorClient, MithrilSingleSigner, MockSignaturePublisher, MockTransactionStore,
+        MockUpkeepService, SingleSigner,
     };
     use crate::store::ProtocolInitializerStore;
-    use crate::{AggregatorHttpSignaturePublisher, MockSignaturePublisher};
     use mithril_common::{
         api_version::APIVersionProvider,
         cardano_block_scanner::DumbBlockScanner,

mithril-signer/src/services/mod.rs

@@ -11,12 +11,14 @@
 
 mod aggregator_client;
 mod cardano_transactions;
+mod signature_publisher;
 mod single_signer;
 mod upkeep_service;
 
 #[cfg(test)]
 pub use aggregator_client::dumb::DumbAggregatorClient;
 pub use aggregator_client::*;
 pub use cardano_transactions::*;
+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::{SignedEntityType, SingleSignatures};
 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

@@ -37,11 +37,11 @@ use mithril_signer::{
     dependency_injection::{DependenciesBuilder, SignerDependencyContainer},
     metrics::*,
     services::{
-        AggregatorClient, CardanoTransactionsImporter, MithrilSingleSigner, SignerUpkeepService,
+        AggregatorClient, AggregatorHttpSignaturePublisher, CardanoTransactionsImporter,
+        MithrilSingleSigner, SignerUpkeepService,
     },
     store::{MKTreeStoreSqlite, ProtocolInitializerStore, ProtocolInitializerStorer},
-    AggregatorHttpSignaturePublisher, Configuration, MetricsService, RuntimeError, SignerRunner,
-    SignerState, StateMachine,
+    Configuration, MetricsService, RuntimeError, SignerRunner, SignerState, StateMachine,
 };
 
 use super::FakeAggregator;