feat(signer): activate DMQ

Author: jpraynaud

mithril-signer/Cargo.toml

@@ -14,11 +14,10 @@ repository = { workspace = true }
 ignored = ["reqwest"]
 
 [features]
-default = ["jemallocator","future_dmq"]
+default = ["jemallocator"]
 
 bundle_tls = ["reqwest/native-tls-vendored"]
 jemallocator = ["dep:tikv-jemallocator"]
-future_dmq = ["dep:mithril-dmq"]
 
 [dependencies]
 anyhow = { workspace = true }
@@ -32,7 +31,7 @@ mithril-cardano-node-chain = { path = "../internal/cardano-node/mithril-cardano-
 mithril-cardano-node-internal-database = { path = "../internal/cardano-node/mithril-cardano-node-internal-database" }
 mithril-cli-helper = { path = "../internal/mithril-cli-helper" }
 mithril-common = { path = "../mithril-common" }
-mithril-dmq = { path = "../internal/mithril-dmq", optional = true }
+mithril-dmq = { path = "../internal/mithril-dmq" }
 mithril-doc = { path = "../internal/mithril-doc" }
 mithril-era = { path = "../internal/mithril-era" }
 mithril-metric = { path = "../internal/mithril-metric" }

mithril-signer/src/configuration.rs

@@ -1,6 +1,5 @@
 use anyhow::Context;
 use config::{ConfigError, Map, Source, Value};
-#[cfg(feature = "future_dmq")]
 use mithril_dmq::DmqNetwork;
 use mithril_doc::{Documenter, DocumenterDefault, StructDoc};
 use serde::{Deserialize, Serialize};
@@ -29,10 +28,6 @@ pub struct SignaturePublisherConfig {
     pub delayer_delay_ms: u64,
 
     /// Whether to skip the delayer when publishing the signature
-    ///
-    /// If set to true, the signatures will be published only once:
-    /// - if the 'future_dmq` feature is used to compile, the signatures will be published only with the DMQ protocol
-    /// - if the `future_dmq` feature is not used, the signatures will be published with the regular HTTP protocol
     pub skip_delayer: bool,
 }
 
@@ -216,7 +211,6 @@ impl Configuration {
     }
 
     /// Return the DMQ network value from the configuration.
-    #[cfg(feature = "future_dmq")]
     pub fn get_dmq_network(&self) -> StdResult<DmqNetwork> {
         DmqNetwork::from_code(self.network.clone(), self.dmq_network_magic).with_context(|| {
             format!(

mithril-signer/src/dependency_injection/builder.rs

@@ -25,7 +25,6 @@ use mithril_common::api_version::APIVersionProvider;
 use mithril_common::crypto_helper::{
     KesSigner, KesSignerStandard, OpCert, ProtocolPartyId, SerDeShelleyFileFormat,
 };
-#[cfg(feature = "future_dmq")]
 use mithril_common::messages::RegisterSignatureMessageDmq;
 use mithril_common::signable_builder::{
     CardanoStakeDistributionSignableBuilder, CardanoTransactionsSignableBuilder,
@@ -44,11 +43,9 @@ use mithril_persistence::sqlite::{ConnectionBuilder, SqliteConnection, SqliteCon
 
 use mithril_protocol_config::http::HttpMithrilNetworkConfigurationProvider;
 
-#[cfg(feature = "future_dmq")]
 use mithril_dmq::{DmqMessageBuilder, DmqPublisherClientPallas};
 
 use crate::dependency_injection::SignerDependencyContainer;
-#[cfg(feature = "future_dmq")]
 use crate::services::SignaturePublisherDmq;
 use crate::services::{
     CardanoTransactionsImporter, CardanoTransactionsPreloaderActivationSigner, MithrilEpochService,
@@ -425,7 +422,6 @@ impl<'a> DependenciesBuilder<'a> {
             _ => None,
         };
 
-        #[cfg(feature = "future_dmq")]
         let signature_publisher = {
             let first_publisher = SignaturePublisherRetrier::new(
                 match &self.config.dmq_node_socket_path {
@@ -473,35 +469,6 @@ impl<'a> DependenciesBuilder<'a> {
             }
         };
 
-        #[cfg(not(feature = "future_dmq"))]
-        let signature_publisher = {
-            let first_publisher = SignaturePublisherRetrier::new(
-                Arc::new(SignaturePublisherNoop) as Arc<dyn SignaturePublisher>,
-                SignaturePublishRetryPolicy::never(),
-            );
-
-            let second_publisher = SignaturePublisherRetrier::new(
-                aggregator_client.clone(),
-                SignaturePublishRetryPolicy {
-                    attempts: self.config.signature_publisher_config.retry_attempts,
-                    delay_between_attempts: Duration::from_millis(
-                        self.config.signature_publisher_config.retry_delay_ms,
-                    ),
-                },
-            );
-
-            if self.config.signature_publisher_config.skip_delayer {
-                Arc::new(second_publisher) as Arc<dyn SignaturePublisher>
-            } else {
-                Arc::new(SignaturePublisherDelayer::new(
-                    Arc::new(first_publisher),
-                    Arc::new(second_publisher),
-                    Duration::from_millis(self.config.signature_publisher_config.delayer_delay_ms),
-                    self.root_logger(),
-                )) as Arc<dyn SignaturePublisher>
-            }
-        };
-
         let certifier = Arc::new(SignerCertifierService::new(
             signed_beacon_repository,
             Arc::new(SignerSignedEntityConfigProvider::new(epoch_service.clone())),

mithril-signer/src/main.rs

@@ -110,11 +110,6 @@ pub struct Args {
     signature_publisher_delayer_delay_ms: u64,
 
     /// Whether to skip the delayer when publishing the signature
-    ///
-    /// If set to true, the signatures will be published only once:
-    /// - if the 'future_dmq` feature is used to compile, the signatures will be published only with the DMQ protocol
-    /// - if the `future_dmq` feature is not used, the signatures will be published with the regular HTTP protocol
-
     #[clap(
         long,
         env = "SIGNATURE_PUBLISHER_SKIP_DELAYER",

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

@@ -1,13 +1,11 @@
 mod delayer;
-#[cfg(feature = "future_dmq")]
 mod dmq;
 mod http;
 mod interface;
 mod noop;
 mod retrier;
 
 pub use delayer::*;
-#[cfg(feature = "future_dmq")]
 pub use dmq::*;
 pub use interface::*;
 pub use noop::*;