Completed the trip to client and back.

src/queue.rs

@@ -9,7 +9,7 @@ use std::{
 };
 use uuid::Uuid;
 
-enum MsgType {
+pub enum MsgType {
     ClientMessage,
     ClientRequest,
     NewClientMessage,
@@ -23,10 +23,10 @@ pub struct Message {
 }
 
 impl Message {
-    pub fn new() -> Self {
+    pub fn new(msg_type: MsgType) -> Self {
         Self {
             id: Uuid::nil(),
-            class: MsgType::NoOp,
+            class: msg_type,
             data: HashMap::new(),
         }
     }
@@ -39,11 +39,11 @@ impl Message {
         }
     }
 
-    fn get_class(&self) -> &MsgType {
+    pub fn get_class(&self) -> &MsgType {
         &self.class
     }
 
-    fn add_data<S, F>(&mut self, name: S, data: F)
+    pub fn add_data<S, F>(&mut self, name: S, data: F)
     where
         S: Into<String>,
         F: Into<Field>,
@@ -51,14 +51,14 @@ impl Message {
         self.data.insert(name.into(), data.into());
     }
 
-    fn get_data(&self) -> &HashMap<String, Field> {
+    pub fn get_data(&self) -> &HashMap<String, Field> {
         &self.data
     }
 }
 
 impl From<Request> for Message {
     fn from(value: Request) -> Self {
-        let msg = Message::new();
+        let msg = Message::new(MsgType::ClientRequest);
         msg.reply(MsgType::ClientRequest)
     }
 }
@@ -69,7 +69,7 @@ mod messages {
 
     #[test]
     fn new_message() {
-        let msg = Message::new();
+        let msg = Message::new(MsgType::NoOp);
         assert_eq!(msg.id, Uuid::nil());
         match msg.class {
             MsgType::NoOp => (),
@@ -81,7 +81,7 @@ mod messages {
     #[test]
     fn create_reply() {
         let id = Uuid::new_v4();
-        let mut msg = Message::new();
+        let mut msg = Message::new(MsgType::NoOp);
         msg.id = id.clone();
         let data = MsgType::NewClientMessage;
         let result = msg.reply(data);
@@ -94,7 +94,7 @@ mod messages {
 
     #[test]
     fn get_message_type() {
-        let msg = Message::new();
+        let msg = Message::new(MsgType::NoOp);
         match msg.get_class() {
             MsgType::NoOp => {}
             _ => unreachable!("should have bneen noopn"),
@@ -103,7 +103,7 @@ mod messages {
 
     #[test]
     fn add_data() {
-        let mut msg = Message::new();
+        let mut msg = Message::new(MsgType::NoOp);
         let one = "one";
         let two = "two".to_string();
         msg.add_data(one, one);
@@ -168,7 +168,7 @@ mod queues {
     #[test]
     fn get_new_client_message() {
         let (tx, rx) = start_queue();
-        let initial = Message::new();
+        let initial = Message::new(MsgType::NoOp);
         let msg = initial.reply(MsgType::NewClientMessage);
         tx.send(msg).unwrap();
         let msg = rx.recv_timeout(TIMEOUT).unwrap();
@@ -181,7 +181,7 @@ mod queues {
     #[test]
     fn new_client_messages_are_unique() {
         let (tx, rx) = start_queue();
-        let msg = Message::new();
+        let msg = Message::new(MsgType::NoOp);
         let mut ids: Vec<Uuid> = Vec::new();
         for _ in 0..10 {
             tx.send(msg.reply(MsgType::NewClientMessage)).unwrap();