feat(aggregator): activate DMQ

Author: jpraynaud

mithril-aggregator/Cargo.toml

@@ -10,11 +10,10 @@ license = { workspace = true }
 repository = { workspace = true }
 
 [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 }
@@ -31,7 +30,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-aggregator/src/configuration.rs

@@ -15,7 +15,6 @@ use mithril_common::entities::{
     SignedEntityTypeDiscriminants,
 };
 use mithril_common::{AggregateSignatureType, CardanoNetwork, StdResult};
-#[cfg(feature = "future_dmq")]
 use mithril_dmq::DmqNetwork;
 use mithril_doc::{Documenter, DocumenterDefault, StructDoc};
 use mithril_era::adapters::EraReaderAdapterType;
@@ -98,7 +97,6 @@ pub trait ConfigurationSource {
     /// DMQ Network Magic number
     ///
     /// useful for TestNet & DevNet
-    #[cfg(feature = "future_dmq")]
     fn dmq_network_magic(&self) -> Option<u64> {
         panic!("dmq_network_magic is not implemented.");
     }
@@ -319,7 +317,6 @@ pub trait ConfigurationSource {
     }
 
     /// Get a representation of the DMQ network.
-    #[cfg(feature = "future_dmq")]
     fn get_dmq_network(&self) -> StdResult<DmqNetwork> {
         DmqNetwork::from_code(self.network(), self.dmq_network_magic())
             .with_context(|| "Invalid DMQ network configuration")
@@ -793,7 +790,6 @@ impl ConfigurationSource for ServeCommandConfiguration {
         self.network_magic
     }
 
-    #[cfg(feature = "future_dmq")]
     fn dmq_network_magic(&self) -> Option<u64> {
         self.dmq_network_magic
     }

mithril-aggregator/src/dependency_injection/builder/enablers/misc.rs

@@ -10,16 +10,13 @@ use std::time::Duration;
 
 use mithril_aggregator_client::AggregatorHttpClient;
 use mithril_common::logging::LoggerExtensions;
-#[cfg(feature = "future_dmq")]
 use mithril_common::messages::RegisterSignatureMessageDmq;
-#[cfg(feature = "future_dmq")]
 use mithril_dmq::DmqConsumerClientPallas;
 use mithril_signed_entity_lock::SignedEntityTypeLock;
 
 use crate::database::repository::CertificateRepository;
 use crate::dependency_injection::{DependenciesBuilder, Result};
 use crate::get_dependency;
-#[cfg(feature = "future_dmq")]
 use crate::services::SignatureConsumerDmq;
 use crate::services::{
     MessageService, MithrilMessageService, SequentialSignatureProcessor, SignatureConsumer,
@@ -85,7 +82,6 @@ impl DependenciesBuilder {
 
     /// Builds a [SignatureConsumer]
     pub async fn build_signature_consumer(&mut self) -> Result<Arc<dyn SignatureConsumer>> {
-        #[cfg(feature = "future_dmq")]
         let signature_consumer = match self.configuration.dmq_node_socket_path() {
             Some(dmq_node_socket_path) => {
                 let dmq_consumer =
@@ -98,8 +94,6 @@ impl DependenciesBuilder {
             }
             _ => Arc::new(SignatureConsumerNoop) as Arc<dyn SignatureConsumer>,
         };
-        #[cfg(not(feature = "future_dmq"))]
-        let signature_consumer = Arc::new(SignatureConsumerNoop) as Arc<dyn SignatureConsumer>;
 
         Ok(signature_consumer)
     }

mithril-aggregator/src/services/signature_consumer/mod.rs

@@ -1,10 +1,8 @@
-#[cfg(feature = "future_dmq")]
 mod dmq;
 mod fake;
 mod interface;
 mod noop;
 
-#[cfg(feature = "future_dmq")]
 pub use dmq::*;
 pub use fake::*;
 pub use interface::*;