refactor(dmq): better TTL support in 'DmqMessageBuilder'

Author: jpraynaud

internal/mithril-dmq-node/src/message.rs

@@ -22,28 +22,19 @@ pub struct DmqMessageBuilder {
 
 impl DmqMessageBuilder {
     /// Creates a new instance of `DmqMessageBuilder`.
-    pub fn new(
-        kes_signer: Arc<dyn KesSigner>,
-        chain_observer: Arc<dyn ChainObserver>,
-        ttl_blocks: u16,
-    ) -> Self {
+    pub fn new(kes_signer: Arc<dyn KesSigner>, chain_observer: Arc<dyn ChainObserver>) -> Self {
         Self {
             kes_signer,
             chain_observer,
-            ttl_blocks,
+            ttl_blocks: DMQ_MESSAGE_TTL_IN_BLOCKS,
         }
     }
 
-    /// Creates a new instance of `DmqMessageBuilder` with default TTL.
-    pub fn new_with_default_ttl(
-        kes_signer: Arc<dyn KesSigner>,
-        chain_observer: Arc<dyn ChainObserver>,
-    ) -> Self {
-        Self {
-            kes_signer,
-            chain_observer,
-            ttl_blocks: DMQ_MESSAGE_TTL_IN_BLOCKS,
-        }
+    /// Set the TTL (Time To Live) for DMQ messages in blocks.
+    pub fn set_ttl(mut self, ttl_blocks: u16) -> Self {
+        self.ttl_blocks = ttl_blocks;
+
+        self
     }
 
     /// Builds a DMQ message from the provided message bytes.
@@ -127,7 +118,7 @@ mod tests {
             },
             ..TimePoint::dummy()
         })));
-        let builder = DmqMessageBuilder::new(kes_signer, chain_observer, 100);
+        let builder = DmqMessageBuilder::new(kes_signer, chain_observer).set_ttl(100);
         let message = test_utils::TestMessage {
             content: b"test".to_vec(),
         };

internal/mithril-dmq-node/src/publisher/pallas.rs

@@ -159,8 +159,8 @@ mod tests {
                         Arc::new(kes_signer)
                     },
                     Arc::new(FakeChainObserver::default()),
-                    100,
-                ),
+                )
+                .set_ttl(100),
                 TestLogger::stdout(),
             );
 
@@ -195,8 +195,8 @@ mod tests {
                         Arc::new(kes_signer)
                     },
                     Arc::new(FakeChainObserver::default()),
-                    100,
-                ),
+                )
+                .set_ttl(100),
                 TestLogger::stdout(),
             );
 

mithril-signer/src/dependency_injection/builder.rs

@@ -425,7 +425,7 @@ impl<'a> DependenciesBuilder<'a> {
                     let publisher = match &self.config.dmq_node_socket_path {
                         Some(dmq_node_socket_path) => {
                             let cardano_network = &self.config.get_network()?;
-                            let dmq_message_builder = DmqMessageBuilder::new_with_default_ttl(
+                            let dmq_message_builder = DmqMessageBuilder::new(
                                 kes_signer.clone().ok_or(anyhow!(
                                     "A KES signer is mandatory to sign DMQ messages"
                                 ))?,