Moved message into separate module.

src/document/clock.rs

@@ -1,5 +1,5 @@
 use crate::{
-    message::{Message, MsgAction, Records},
+    message::wrapper::{Message, MsgAction, Records},
     name::{Name, NameType, Names},
     queue::{
         data_director::{RegMsg, Register},

src/document/create.rs

@@ -3,7 +3,7 @@ use crate::{
         definition::{DocDef, DocFuncType},
         field::Field,
     },
-    message::{
+    message::wrapper::{
         Action, CalcValue, Calculation, InternalRecord, InternalRecords, Message, MsgAction, Oid,
         Query, Records, Reply, Update,
     },
@@ -317,7 +317,7 @@ impl Indexes {
 #[cfg(test)]
 mod indexes {
     use super::*;
-    use crate::{document::field::FieldType, message::Operand};
+    use crate::{document::field::FieldType, message::wrapper::Operand};
 
     fn get_fields(count: usize) -> Vec<Field> {
         let mut output = Vec::new();
@@ -814,7 +814,7 @@ mod document_files {
     use super::*;
     use crate::{
         document::field::FieldType,
-        message::{Addition, Delete, Operand},
+        message::wrapper::{Addition, Delete, Operand},
         name::{Name, Names},
         support_tests::TIMEOUT,
     };

src/document/definition.rs

@@ -3,7 +3,7 @@ use crate::{
         create::IndexType,
         field::{Field, FieldType},
     },
-    message::{Action, CalcValue, MsgAction},
+    message::wrapper::{Action, CalcValue, MsgAction},
     mtterror::MTTError,
     name::{Name, NameType, Names},
     queue::data_director::{Include, Path},
@@ -75,7 +75,7 @@ impl FieldSetting {
 #[cfg(test)]
 mod fieldsettings {
     use super::*;
-    use crate::message::{Calculation, Operand};
+    use crate::message::wrapper::{Calculation, Operand};
     use chrono::Utc;
     use std::time::Duration;
 
@@ -379,7 +379,7 @@ impl DocDef {
 #[cfg(test)]
 mod docdefs {
     use super::*;
-    use crate::message::{Query, Update};
+    use crate::message::wrapper::{Query, Update};
 
     #[test]
     fn can_field_be_added() {

src/document/session.rs

@@ -4,7 +4,7 @@ use crate::{
         definition::{DocDef, DocFuncType},
         field::FieldType,
     },
-    message::{Action, CalcValue, Calculation, Delete, Message, Operand, Query, Update},
+    message::wrapper::{Action, CalcValue, Calculation, Delete, Message, Operand, Query, Update},
     name::{Name, NameType},
     queue::{
         data_director::{Include, Path, RegMsg, Register},
@@ -89,7 +89,7 @@ mod sessions {
     use super::*;
     use crate::{
         document::{clock::Clock, create::CreateDoc, field::Field},
-        message::{Addition, MsgAction, Query, Records},
+        message::wrapper::{Addition, MsgAction, Query, Records},
         mtterror::MTTError,
         name::{Name, NameType, Names},
         queue::data_director::{Include, Path, RegMsg, Register},

src/lib.rs

@@ -10,8 +10,8 @@ use document::{
     field::{Field, FieldType},
     session::Session,
 };
-use message::{Action, Addition, CalcValue, Calculation, Message, Operand};
-pub use message::{MsgAction, Query};
+use message::wrapper::{Action, Addition, CalcValue, Calculation, Message, Operand};
+pub use message::wrapper::{MsgAction, Query};
 use name::{Name, NameType};
 use queue::{
     data_director::{Include, Path, RegMsg, Register},

src/queue/data_director.rs

@@ -1,5 +1,5 @@
 use crate::{
-    message::{Action, Message, MsgAction},
+    message::wrapper::{Action, Message, MsgAction},
     mtterror::MTTError,
     name::{Name, NameType, Names},
     queue::router::Queue,
@@ -120,7 +120,7 @@ impl Path {
 mod paths {
     use super::*;
     use crate::{
-        message::{MsgAction, Records},
+        message::wrapper::{MsgAction, Records},
         name::{Name, Names},
     };
 

src/queue/router.rs

@@ -1,5 +1,5 @@
 use crate::{
-    message::Message,
+    message::wrapper::Message,
     name::NameType,
     queue::data_director::{DocRegistry, RegMsg, Register},
 };
@@ -97,7 +97,7 @@ impl Queue {
 mod routers {
     use super::*;
     use crate::{
-        message::{MsgAction, Query},
+        message::wrapper::{MsgAction, Query},
         name::Name,
         support_tests::TIMEOUT,
     };
@@ -242,7 +242,7 @@ mod routers {
 mod queues {
     use super::*;
     use crate::{
-        message::MsgAction,
+        message::wrapper::MsgAction,
         mtterror::MTTError,
         name::Name,
         queue::data_director::{Include, Path},