chore(dmq): use 'DmqNetwork' model

jpraynaud · jpraynaud · commit 29e9dde82625 · 2025-10-21T18:55:10.000+02:00
diff --git a/internal/mithril-dmq/src/consumer/client/pallas.rs b/internal/mithril-dmq/src/consumer/client/pallas.rs
@@ -6,30 +6,30 @@ use slog::{Logger, debug, error};
 use tokio::sync::{Mutex, MutexGuard};
 
 use mithril_common::{
-    CardanoNetwork, StdResult,
+    StdResult,
     crypto_helper::{
         OpCert, OpCertWithoutColdVerificationKey, TryFromBytes, ed25519::Ed25519VerificationKey,
     },
     entities::PartyId,
     logging::LoggerExtensions,
 };
 
-use crate::DmqConsumerClient;
+use crate::{DmqConsumerClient, model::DmqNetwork};
 
 /// A DMQ client consumer implementation.
 ///
 /// This implementation is built upon the n2c mini-protocols DMQ implementation in Pallas.
 pub struct DmqConsumerClientPallas<M: TryFromBytes + Debug> {
     socket: PathBuf,
-    network: CardanoNetwork,
+    network: DmqNetwork,
     client: Mutex<Option<DmqClient>>,
     logger: Logger,
     phantom: PhantomData<M>,
 }
 
 impl<M: TryFromBytes + Debug> DmqConsumerClientPallas<M> {
     /// Creates a new `DmqConsumerClientPallas` instance.
-    pub fn new(socket: PathBuf, network: CardanoNetwork, logger: Logger) -> Self {
+    pub fn new(socket: PathBuf, network: DmqNetwork, logger: Logger) -> Self {
         Self {
             socket,
             network,
@@ -278,7 +278,7 @@ mod tests {
 
             let consumer = DmqConsumerClientPallas::new(
                 socket_path,
-                CardanoNetwork::TestNet(0),
+                DmqNetwork::TestNet(0),
                 TestLogger::stdout(),
             );
 
@@ -314,7 +314,7 @@ mod tests {
 
             let consumer = DmqConsumerClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                CardanoNetwork::TestNet(0),
+                DmqNetwork::TestNet(0),
                 TestLogger::stdout(),
             );
 
@@ -341,7 +341,7 @@ mod tests {
 
             let consumer = DmqConsumerClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                CardanoNetwork::TestNet(0),
+                DmqNetwork::TestNet(0),
                 TestLogger::stdout(),
             );
 
diff --git a/internal/mithril-dmq/src/consumer/server/pallas.rs b/internal/mithril-dmq/src/consumer/server/pallas.rs
@@ -11,16 +11,16 @@ use tokio::{
 
 use slog::{Logger, debug, error, info, warn};
 
-use mithril_common::{CardanoNetwork, StdResult, logging::LoggerExtensions};
+use mithril_common::{StdResult, logging::LoggerExtensions};
 
-use crate::{DmqConsumerServer, DmqMessage};
+use crate::{DmqConsumerServer, DmqMessage, DmqNetwork};
 
 use super::queue::MessageQueue;
 
 /// A DMQ server implementation for messages notification from a DMQ node.
 pub struct DmqConsumerServerPallas {
     socket: PathBuf,
-    network: CardanoNetwork,
+    network: DmqNetwork,
     server: Mutex<Option<DmqServer>>,
     messages_receiver: Mutex<Option<UnboundedReceiver<DmqMessage>>>,
     messages_buffer: MessageQueue,
@@ -32,7 +32,7 @@ impl DmqConsumerServerPallas {
     /// Creates a new instance of [DmqConsumerServerPallas].
     pub fn new(
         socket: PathBuf,
-        network: CardanoNetwork,
+        network: DmqNetwork,
         stop_rx: Receiver<()>,
         logger: Logger,
     ) -> Self {
@@ -303,10 +303,10 @@ mod tests {
         let (stop_tx, stop_rx) = watch::channel(());
         let (signature_dmq_tx, signature_dmq_rx) = unbounded_channel::<DmqMessage>();
         let socket_path = create_temp_dir(current_function_name).join("node.socket");
-        let cardano_network = CardanoNetwork::TestNet(0);
+        let dmq_network = DmqNetwork::TestNet(0);
         let dmq_consumer_server = Arc::new(DmqConsumerServerPallas::new(
             socket_path.to_path_buf(),
-            cardano_network.to_owned(),
+            dmq_network.to_owned(),
             stop_rx,
             TestLogger::stdout(),
         ));
@@ -363,10 +363,10 @@ mod tests {
         let (stop_tx, stop_rx) = watch::channel(());
         let (signature_dmq_tx, signature_dmq_rx) = unbounded_channel::<DmqMessage>();
         let socket_path = create_temp_dir(current_function_name).join("node.socket");
-        let cardano_network = CardanoNetwork::TestNet(0);
+        let dmq_network = DmqNetwork::TestNet(0);
         let dmq_consumer_server = Arc::new(DmqConsumerServerPallas::new(
             socket_path.to_path_buf(),
-            cardano_network.to_owned(),
+            dmq_network.to_owned(),
             stop_rx,
             TestLogger::stdout(),
         ));
@@ -422,10 +422,10 @@ mod tests {
         let (_stop_tx, stop_rx) = watch::channel(());
         let (_signature_dmq_tx, signature_dmq_rx) = unbounded_channel::<DmqMessage>();
         let socket_path = create_temp_dir(current_function!()).join("node.socket");
-        let cardano_network = CardanoNetwork::TestNet(0);
+        let dmq_network = DmqNetwork::TestNet(0);
         let dmq_consumer_server = Arc::new(DmqConsumerServerPallas::new(
             socket_path.to_path_buf(),
-            cardano_network.to_owned(),
+            dmq_network.to_owned(),
             stop_rx,
             TestLogger::stdout(),
         ));
diff --git a/internal/mithril-dmq/src/lib.rs b/internal/mithril-dmq/src/lib.rs
@@ -9,7 +9,7 @@ pub mod test;
 #[cfg(unix)]
 pub use consumer::DmqConsumerServerPallas;
 pub use consumer::{DmqConsumerClient, DmqConsumerClientPallas, DmqConsumerServer};
-pub use model::{DmqMessage, DmqMessageBuilder};
+pub use model::{DmqMessage, DmqMessageBuilder, DmqNetwork};
 #[cfg(unix)]
 pub use publisher::DmqPublisherServerPallas;
 pub use publisher::{DmqPublisherClient, DmqPublisherClientPallas, DmqPublisherServer};
diff --git a/internal/mithril-dmq/src/publisher/client/pallas.rs b/internal/mithril-dmq/src/publisher/client/pallas.rs
@@ -4,18 +4,16 @@ use anyhow::Context;
 use pallas_network::{facades::DmqClient, miniprotocols::localtxsubmission::Response};
 use slog::{Logger, debug, error};
 
-use mithril_common::{
-    CardanoNetwork, StdResult, crypto_helper::TryToBytes, logging::LoggerExtensions,
-};
+use mithril_common::{StdResult, crypto_helper::TryToBytes, logging::LoggerExtensions};
 
-use crate::{DmqMessageBuilder, DmqPublisherClient};
+use crate::{DmqMessageBuilder, DmqPublisherClient, model::DmqNetwork};
 
 /// A DMQ client publisher implementation.
 ///
 /// This implementation is built upon the n2c mini-protocols DMQ implementation in Pallas.
 pub struct DmqPublisherClientPallas<M: TryToBytes + Debug> {
     socket: PathBuf,
-    network: CardanoNetwork,
+    network: DmqNetwork,
     dmq_message_builder: DmqMessageBuilder,
     logger: Logger,
     phantom: PhantomData<M>,
@@ -25,7 +23,7 @@ impl<M: TryToBytes + Debug> DmqPublisherClientPallas<M> {
     /// Creates a new instance of [DmqPublisherClientPallas].
     pub fn new(
         socket: PathBuf,
-        network: CardanoNetwork,
+        network: DmqNetwork,
         dmq_message_builder: DmqMessageBuilder,
         logger: Logger,
     ) -> Self {
@@ -153,7 +151,7 @@ mod tests {
 
             let publisher = DmqPublisherClientPallas::new(
                 socket_path,
-                CardanoNetwork::TestNet(0),
+                DmqNetwork::TestNet(0),
                 DmqMessageBuilder::new(
                     {
                         let (kes_signature, operational_certificate) =
@@ -191,7 +189,7 @@ mod tests {
 
             let publisher = DmqPublisherClientPallas::new(
                 socket_path,
-                CardanoNetwork::TestNet(0),
+                DmqNetwork::TestNet(0),
                 DmqMessageBuilder::new(
                     {
                         let (kes_signature, operational_certificate) =
diff --git a/internal/mithril-dmq/src/publisher/server/pallas.rs b/internal/mithril-dmq/src/publisher/server/pallas.rs
@@ -16,14 +16,14 @@ use tokio::{
 
 use slog::{Logger, debug, error, info, warn};
 
-use mithril_common::{CardanoNetwork, StdResult, logging::LoggerExtensions};
+use mithril_common::{StdResult, logging::LoggerExtensions};
 
-use crate::{DmqMessage, DmqPublisherServer};
+use crate::{DmqMessage, DmqNetwork, DmqPublisherServer};
 
 /// A DMQ server implementation for messages publication to a DMQ node.
 pub struct DmqPublisherServerPallas {
     socket: PathBuf,
-    network: CardanoNetwork,
+    network: DmqNetwork,
     server: Mutex<Option<DmqServer>>,
     transmitters: Mutex<Vec<UnboundedSender<DmqMessage>>>,
     stop_rx: Receiver<()>,
@@ -34,7 +34,7 @@ impl DmqPublisherServerPallas {
     /// Creates a new instance of [DmqPublisherServerPallas].
     pub fn new(
         socket: PathBuf,
-        network: CardanoNetwork,
+        network: DmqNetwork,
         stop_rx: Receiver<()>,
         logger: Logger,
     ) -> Self {
@@ -278,7 +278,7 @@ mod tests {
         let (stop_tx, stop_rx) = watch::channel(());
         let (signature_dmq_tx, signature_dmq_rx) = unbounded_channel::<DmqMessage>();
         let socket_path = create_temp_dir(current_function!()).join("node.socket");
-        let cardano_network = CardanoNetwork::TestNet(0);
+        let cardano_network = DmqNetwork::TestNet(0);
         let dmq_publisher_server = Arc::new(DmqPublisherServerPallas::new(
             socket_path.to_path_buf(),
             cardano_network.to_owned(),
diff --git a/internal/mithril-dmq/tests/consumer_client_server.rs b/internal/mithril-dmq/tests/consumer_client_server.rs
@@ -3,16 +3,17 @@ use std::sync::Arc;
 
 use tokio::sync::{mpsc::unbounded_channel, watch};
 
-use mithril_common::{CardanoNetwork, current_function, test::TempDir};
+use mithril_common::{current_function, test::TempDir};
 use mithril_dmq::{
     DmqConsumerClient, DmqConsumerClientPallas, DmqConsumerServer, DmqConsumerServerPallas,
-    DmqMessage, test::fake_message::compute_fake_msg, test::payload::DmqMessageTestPayload,
+    DmqMessage, DmqNetwork,
+    test::{fake_message::compute_fake_msg, payload::DmqMessageTestPayload},
 };
 
 #[tokio::test(flavor = "multi_thread")]
 async fn dmq_consumer_client_server() {
     let current_function_name = current_function!();
-    let cardano_network = CardanoNetwork::TestNet(0);
+    let dmq_network = DmqNetwork::TestNet(0);
     let socket_path =
         TempDir::create_with_short_path("dmq_consumer_client_server", current_function_name)
             .join("node.socket");
@@ -25,7 +26,7 @@ async fn dmq_consumer_client_server() {
         async move {
             let dmq_consumer_server = Arc::new(DmqConsumerServerPallas::new(
                 socket_path.to_path_buf(),
-                cardano_network,
+                dmq_network,
                 stop_rx,
                 slog_scope::logger(),
             ));
@@ -41,7 +42,7 @@ async fn dmq_consumer_client_server() {
         async move {
             let consumer_client = DmqConsumerClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                cardano_network,
+                dmq_network,
                 slog_scope::logger(),
             );
             let mut messages = vec![];
@@ -81,7 +82,7 @@ async fn dmq_consumer_client_server() {
         async move {
             let consumer_client = DmqConsumerClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                cardano_network,
+                dmq_network,
                 slog_scope::logger(),
             );
             let mut messages = vec![];
diff --git a/internal/mithril-dmq/tests/publisher_client_server.rs b/internal/mithril-dmq/tests/publisher_client_server.rs
@@ -5,11 +5,11 @@ use tokio::sync::{mpsc::unbounded_channel, watch};
 
 use mithril_cardano_node_chain::test::double::FakeChainObserver;
 use mithril_common::{
-    CardanoNetwork, current_function,
+    current_function,
     test::{TempDir, crypto_helper::KesSignerFake},
 };
 use mithril_dmq::{
-    DmqMessage, DmqMessageBuilder, DmqPublisherClient, DmqPublisherClientPallas,
+    DmqMessage, DmqMessageBuilder, DmqNetwork, DmqPublisherClient, DmqPublisherClientPallas,
     DmqPublisherServer, DmqPublisherServerPallas,
     test::{
         double::FakeUnixTimestampProvider, fake_message::compute_fake_msg,
@@ -20,7 +20,7 @@ use mithril_dmq::{
 #[tokio::test]
 async fn dmq_publisher_client_server() {
     let current_function_name = current_function!();
-    let cardano_network = CardanoNetwork::TestNet(0);
+    let dmq_network = DmqNetwork::TestNet(0);
     let socket_path =
         TempDir::create_with_short_path("dmq_publisher_client_server", current_function_name)
             .join("node.socket");
@@ -33,7 +33,7 @@ async fn dmq_publisher_client_server() {
         async move {
             let dmq_publisher_server = Arc::new(DmqPublisherServerPallas::new(
                 socket_path.to_path_buf(),
-                cardano_network,
+                dmq_network,
                 stop_rx,
                 slog_scope::logger(),
             ));
@@ -68,7 +68,7 @@ async fn dmq_publisher_client_server() {
             ));
             let publisher_client = DmqPublisherClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                cardano_network,
+                dmq_network,
                 dmq_builder,
                 slog_scope::logger(),
             );
@@ -113,7 +113,7 @@ async fn dmq_publisher_client_server() {
             ));
             let publisher_client = DmqPublisherClientPallas::<DmqMessageTestPayload>::new(
                 socket_path,
-                cardano_network,
+                dmq_network,
                 dmq_builder,
                 slog_scope::logger(),
             );
