refactor(dmq): promote 'message' module to directory

Author: jpraynaud

internal/mithril-dmq/src/lib.rs

@@ -2,12 +2,12 @@
 //! This crate provides mechanisms to publish and consume messages of a Decentralized Message Queue network through a DMQ node.
 
 mod consumer;
-mod message;
+mod model;
 mod publisher;
 pub mod test;
 
 pub use consumer::{DmqConsumerClient, DmqConsumerClientPallas};
-pub use message::DmqMessageBuilder;
+pub use model::{DmqMessage, DmqMessageBuilder};
 pub use publisher::{DmqPublisherClient, DmqPublisherClientPallas};
 
 #[cfg(test)]

internal/mithril-dmq/src/message.rs renamed to internal/mithril-dmq/src/model/builder.rs

@@ -10,6 +10,8 @@ use mithril_common::{
     crypto_helper::{KesSigner, TryToBytes},
 };
 
+use crate::model::DmqMessage;
+
 /// The TTL (Time To Live) for DMQ messages in blocks.
 const DMQ_MESSAGE_TTL_IN_BLOCKS: u16 = 100;
 
@@ -38,7 +40,7 @@ impl DmqMessageBuilder {
     }
 
     /// Builds a DMQ message from the provided message bytes.
-    pub async fn build(&self, message_bytes: &[u8]) -> StdResult<DmqMsg> {
+    pub async fn build(&self, message_bytes: &[u8]) -> StdResult<DmqMessage> {
         fn compute_msg_id(dmq_message: &DmqMsg) -> Vec<u8> {
             let mut hasher = Blake2b::<U64>::new();
             hasher.update(&dmq_message.msg_body);
@@ -76,7 +78,7 @@ impl DmqMessageBuilder {
         };
         dmq_message.msg_id = compute_msg_id(&dmq_message);
 
-        Ok(dmq_message)
+        Ok(dmq_message.into())
     }
 }
 
@@ -137,7 +139,7 @@ mod tests {
             },
             DmqMsg {
                 msg_id: vec![],
-                ..dmq_message
+                ..dmq_message.into()
             }
         );
     }

internal/mithril-dmq/src/model/mod.rs

@@ -0,0 +1,3 @@
+mod builder;
+
+pub use builder::*;