chore(signer): use 'DmqNetwork' model

Author: jpraynaud

mithril-signer/src/configuration.rs

@@ -1,5 +1,7 @@
 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};
 use std::{path::PathBuf, sync::Arc};
@@ -53,11 +55,16 @@ pub struct Configuration {
     #[example = "`mainnet` or `preprod` or `devnet`"]
     pub network: String,
 
-    /// Cardano Network Magic number
+    /// Cardano network magic number
     /// useful for TestNet & DevNet
     #[example = "`1097911063` or `42`"]
     pub network_magic: Option<u64>,
 
+    /// DMQ network magic number
+    /// useful for TestNet & DevNet
+    #[example = "`1097911063` or `42`"]
+    pub dmq_network_magic: Option<u64>,
+
     /// Also known as `k`, it defines the number of blocks that are required for the blockchain to
     /// be considered final, preventing any further rollback `[default: 2160]`.
     pub network_security_parameter: BlockNumber,
@@ -164,6 +171,7 @@ impl Configuration {
             db_directory: PathBuf::new(),
             network: "devnet".to_string(),
             network_magic: Some(42),
+            dmq_network_magic: Some(3141592),
             network_security_parameter: BlockNumber(2160),
             preload_security_parameter: BlockNumber(30),
             party_id: Some(party_id),
@@ -195,7 +203,7 @@ impl Configuration {
         }
     }
 
-    /// Return the CardanoNetwork value from the configuration.
+    /// Return the Cardano network value from the configuration.
     pub fn get_network(&self) -> StdResult<CardanoNetwork> {
         CardanoNetwork::from_code(self.network.clone(), self.network_magic).with_context(|| {
             format!(
@@ -205,6 +213,17 @@ 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!(
+                "Could not read DMQ Network '{}' from configuration.",
+                &self.network
+            )
+        })
+    }
+
     /// Create the SQL store directory if not exist and return the path of the
     /// SQLite3 file.
     pub fn get_sqlite_file(&self, sqlite_file_name: &str) -> StdResult<PathBuf> {

mithril-signer/src/dependency_injection/builder.rs

@@ -422,7 +422,7 @@ impl<'a> DependenciesBuilder<'a> {
             let first_publisher = SignaturePublisherRetrier::new(
                 match &self.config.dmq_node_socket_path {
                     Some(dmq_node_socket_path) => {
-                        let cardano_network = &self.config.get_network()?;
+                        let dmq_network = &self.config.get_dmq_network()?;
                         let dmq_message_builder = DmqMessageBuilder::new(
                             kes_signer
                                 .clone()
@@ -432,7 +432,7 @@ impl<'a> DependenciesBuilder<'a> {
                         Arc::new(SignaturePublisherDmq::new(Arc::new(
                             DmqPublisherClientPallas::<RegisterSignatureMessageDmq>::new(
                                 dmq_node_socket_path.to_owned(),
-                                *cardano_network,
+                                *dmq_network,
                                 dmq_message_builder,
                                 self.root_logger(),
                             ),