wip(e2e): support for fake DMQ node

jpraynaud · jpraynaud · commit 730ee7521069 · 2025-07-08T17:48:04.000+02:00
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
@@ -75,6 +75,7 @@ impl Aggregator {
         let public_server_url = format!("http://localhost:{server_port_parameter}/aggregator");
         let mut env = HashMap::from([
             ("NETWORK", "devnet"),
+            ("NETWORK_MAGIC", &magic_id),
             ("RUN_INTERVAL", &mithril_run_interval),
             ("SERVER_IP", "0.0.0.0"),
             ("SERVER_PORT", &server_port_parameter),
@@ -85,7 +86,6 @@ impl Aggregator {
                 "SNAPSHOT_DIRECTORY",
                 aggregator_config.artifacts_dir.to_str().unwrap(),
             ),
-            ("NETWORK_MAGIC", &magic_id),
             (
                 "DATA_STORES_DIRECTORY",
                 aggregator_config.store_dir.to_str().unwrap(),
@@ -129,6 +129,16 @@ impl Aggregator {
         if let Some(leader_aggregator_endpoint) = aggregator_config.leader_aggregator_endpoint {
             env.insert("LEADER_AGGREGATOR_ENDPOINT", leader_aggregator_endpoint);
         }
+        // TODO: make this configurable
+        let dmq_node_socket_path = aggregator_config
+            .work_dir
+            .join(format!("dmq-aggregator-{}.socket", aggregator_config.index));
+        if true {
+            env.insert(
+                "DMQ_NODE_SOCKET_PATH",
+                dmq_node_socket_path.to_str().unwrap(),
+            );
+        }
         let args = vec![
             "--db-directory",
             aggregator_config.full_node.db_path.to_str().unwrap(),
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/infrastructure.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/infrastructure.rs
@@ -266,7 +266,7 @@ impl MithrilInfrastructure {
         let mut bootstrap_peer_addr = None;
         for (index, aggregator_endpoint) in aggregator_endpoints.iter().enumerate() {
             let mut relay_aggregator = RelayAggregator::new(
-                Aggregator::name_suffix(index),
+                index,
                 config.server_port + index as u64 + 100,
                 bootstrap_peer_addr.clone(),
                 aggregator_endpoint,
@@ -282,6 +282,7 @@ impl MithrilInfrastructure {
 
         for (index, party_id) in signers_party_ids.iter().enumerate() {
             let mut relay_signer = RelaySigner::new(&RelaySignerConfiguration {
+                signer_number: index + 1,
                 listen_port: config.server_port + index as u64 + 200,
                 server_port: config.server_port + index as u64 + 300,
                 dial_to: bootstrap_peer_addr.clone(),
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/relay_aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/relay_aggregator.rs
@@ -1,4 +1,5 @@
 use crate::utils::MithrilCommand;
+use crate::{Aggregator, DEVNET_MAGIC_ID};
 use mithril_common::StdResult;
 use std::collections::HashMap;
 use std::path::Path;
@@ -14,16 +15,25 @@ pub struct RelayAggregator {
 
 impl RelayAggregator {
     pub fn new(
-        name: String,
+        index: usize,
         listen_port: u64,
         dial_to: Option<String>,
         aggregator_endpoint: &str,
         work_dir: &Path,
         bin_dir: &Path,
     ) -> StdResult<Self> {
+        let name = Aggregator::name_suffix(index);
         let listen_port_str = format!("{listen_port}");
+        let dmq_node_socket_path = work_dir.join(format!("dmq-aggregator-{index}.socket"));
+        let magic_id = DEVNET_MAGIC_ID.to_string();
         let mut env = HashMap::from([
             ("LISTEN_PORT", listen_port_str.as_str()),
+            (
+                "DMQ_NODE_SOCKET_PATH",
+                dmq_node_socket_path.to_str().unwrap(),
+            ),
+            ("NETWORK", "devnet"),
+            ("NETWORK_MAGIC", &magic_id),
             ("AGGREGATOR_ENDPOINT", aggregator_endpoint),
         ]);
         if let Some(dial_to) = &dial_to {
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/relay_signer.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/relay_signer.rs
@@ -1,3 +1,4 @@
+use crate::DEVNET_MAGIC_ID;
 use crate::utils::MithrilCommand;
 use mithril_common::StdResult;
 use mithril_common::entities::PartyId;
@@ -6,6 +7,7 @@ use std::path::Path;
 use tokio::process::Child;
 
 pub struct RelaySignerConfiguration<'a> {
+    pub signer_number: usize,
     pub listen_port: u64,
     pub server_port: u64,
     pub dial_to: Option<String>,
@@ -28,15 +30,26 @@ pub struct RelaySigner {
 
 impl RelaySigner {
     pub fn new(configuration: &RelaySignerConfiguration) -> StdResult<Self> {
+        let party_id = configuration.party_id.to_owned();
         let listen_port_str = format!("{}", configuration.listen_port);
         let server_port_str = format!("{}", configuration.server_port);
+        let dmq_node_socket_path = configuration
+            .work_dir
+            .join(format!("dmq-signer-{}.socket", configuration.signer_number));
+        let magic_id = DEVNET_MAGIC_ID.to_string();
         let relay_signer_registration_mode =
             configuration.relay_signer_registration_mode.to_string();
         let relay_signature_registration_mode =
             configuration.relay_signature_registration_mode.to_string();
         let mut env = HashMap::from([
             ("LISTEN_PORT", listen_port_str.as_str()),
             ("SERVER_PORT", server_port_str.as_str()),
+            (
+                "DMQ_NODE_SOCKET_PATH",
+                dmq_node_socket_path.to_str().unwrap(),
+            ),
+            ("NETWORK", "devnet"),
+            ("NETWORK_MAGIC", &magic_id),
             ("AGGREGATOR_ENDPOINT", configuration.aggregator_endpoint),
             ("SIGNER_REPEATER_DELAY", "100"),
             (
@@ -65,7 +78,7 @@ impl RelaySigner {
         Ok(Self {
             listen_port: configuration.listen_port,
             server_port: configuration.server_port,
-            party_id: configuration.party_id.to_owned(),
+            party_id,
             command,
             process: None,
         })
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/signer.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/signer.rs
@@ -54,6 +54,7 @@ impl Signer {
         let mithril_run_interval = format!("{}", signer_config.mithril_run_interval);
         let mut env = HashMap::from([
             ("NETWORK", "devnet"),
+            ("NETWORK_MAGIC", &magic_id),
             ("RUN_INTERVAL", &mithril_run_interval),
             ("AGGREGATOR_ENDPOINT", &signer_config.aggregator_endpoint),
             (
@@ -65,7 +66,6 @@ impl Signer {
                 signer_config.store_dir.to_str().unwrap(),
             ),
             ("STORE_RETENTION_LIMIT", "10"),
-            ("NETWORK_MAGIC", &magic_id),
             (
                 "CARDANO_NODE_SOCKET_PATH",
                 signer_config.pool_node.socket_path.to_str().unwrap(),
@@ -96,6 +96,16 @@ impl Signer {
         } else {
             env.insert("PARTY_ID", &party_id);
         }
+        // TODO: make this configurable
+        let dmq_node_socket_path = signer_config
+            .work_dir
+            .join(format!("dmq-signer-{}.socket", signer_config.signer_number));
+        if true {
+            env.insert(
+                "DMQ_NODE_SOCKET_PATH",
+                dmq_node_socket_path.to_str().unwrap(),
+            );
+        }
         let args = vec!["-vvv"];
 
         let mut command = MithrilCommand::new(
