From e91dabf1a3bfe9b48f562421c82b8e214e5fee9c Mon Sep 17 00:00:00 2001 From: DJO <790521+Alenar@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:19:19 +0200 Subject: [PATCH] Move `signature_publisher` module to `services` --- mithril-signer/src/dependency_injection/builder.rs | 10 +++++----- mithril-signer/src/dependency_injection/containers.rs | 6 ++++-- mithril-signer/src/lib.rs | 2 -- mithril-signer/src/runtime/runner.rs | 7 +++---- mithril-signer/src/services/mod.rs | 2 ++ .../src/{ => services}/signature_publisher/http.rs | 3 +-- .../{ => services}/signature_publisher/interface.rs | 0 .../src/{ => services}/signature_publisher/mod.rs | 0 .../{ => services}/signature_publisher/unix_socket.rs | 2 +- .../tests/test_extensions/state_machine_tester.rs | 7 +++---- 10 files changed, 19 insertions(+), 20 deletions(-) rename mithril-signer/src/{ => services}/signature_publisher/http.rs (93%) rename mithril-signer/src/{ => services}/signature_publisher/interface.rs (100%) rename mithril-signer/src/{ => services}/signature_publisher/mod.rs (100%) rename mithril-signer/src/{ => services}/signature_publisher/unix_socket.rs (98%) diff --git a/mithril-signer/src/dependency_injection/builder.rs b/mithril-signer/src/dependency_injection/builder.rs index 29b6ae0c861..6a0993fb7ae 100644 --- a/mithril-signer/src/dependency_injection/builder.rs +++ b/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, }; diff --git a/mithril-signer/src/dependency_injection/containers.rs b/mithril-signer/src/dependency_injection/containers.rs index e4abe75c28a..ba2db5b6999 100644 --- a/mithril-signer/src/dependency_injection/containers.rs +++ b/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; type CertificateHandlerService = Arc; diff --git a/mithril-signer/src/lib.rs b/mithril-signer/src/lib.rs index 8710ccd37f8..c5df36df3b3 100644 --- a/mithril-signer/src/lib.rs +++ b/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; diff --git a/mithril-signer/src/runtime/runner.rs b/mithril-signer/src/runtime/runner.rs index 0d298c42217..42a9d004e7d 100644 --- a/mithril-signer/src/runtime/runner.rs +++ b/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::*; diff --git a/mithril-signer/src/services/mod.rs b/mithril-signer/src/services/mod.rs index e6231f5d35f..a3077866992 100644 --- a/mithril-signer/src/services/mod.rs +++ b/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::*; diff --git a/mithril-signer/src/signature_publisher/http.rs b/mithril-signer/src/services/signature_publisher/http.rs similarity index 93% rename from mithril-signer/src/signature_publisher/http.rs rename to mithril-signer/src/services/signature_publisher/http.rs index a2d400336dd..8d8797a0794 100644 --- a/mithril-signer/src/signature_publisher/http.rs +++ b/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 { diff --git a/mithril-signer/src/signature_publisher/interface.rs b/mithril-signer/src/services/signature_publisher/interface.rs similarity index 100% rename from mithril-signer/src/signature_publisher/interface.rs rename to mithril-signer/src/services/signature_publisher/interface.rs diff --git a/mithril-signer/src/signature_publisher/mod.rs b/mithril-signer/src/services/signature_publisher/mod.rs similarity index 100% rename from mithril-signer/src/signature_publisher/mod.rs rename to mithril-signer/src/services/signature_publisher/mod.rs diff --git a/mithril-signer/src/signature_publisher/unix_socket.rs b/mithril-signer/src/services/signature_publisher/unix_socket.rs similarity index 98% rename from mithril-signer/src/signature_publisher/unix_socket.rs rename to mithril-signer/src/services/signature_publisher/unix_socket.rs index 11a73f618d1..b460dcf3fac 100644 --- a/mithril-signer/src/signature_publisher/unix_socket.rs +++ b/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 { diff --git a/mithril-signer/tests/test_extensions/state_machine_tester.rs b/mithril-signer/tests/test_extensions/state_machine_tester.rs index df493198385..d779575efc8 100644 --- a/mithril-signer/tests/test_extensions/state_machine_tester.rs +++ b/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;