Delivery contracts improvments

Author: amigin

Diff for: src/lib.rs

@@ -12,5 +12,5 @@ mod tcp_serializer;
 pub use connection_attrs::{ConnectionAttributes, PacketProtVer};
 
 pub use packet_versions::PacketVersions;
-pub use tcp_contracts::{MessageToDeliverTcpContract, TcpContract};
+pub use tcp_contracts::TcpContract;
 pub use tcp_serializer::MySbTcpSerializer;

Diff for: src/tcp_contracts.rs

@@ -1,7 +1,5 @@
-use my_service_bus_abstractions::MessageToPublish;
-use my_service_bus_shared::{
-    queue::TopicQueueType, queue_with_intervals::QueueIndexRange, MessageId,
-};
+use my_service_bus_abstractions::{publisher::MessageToPublish, subscriber::MySbMessageToDeliver};
+use my_service_bus_shared::{queue::TopicQueueType, queue_with_intervals::QueueIndexRange};
 use my_tcp_sockets::socket_reader::{ReadingTcpContractFail, SocketReader};
 
 use crate::ConnectionAttributes;
@@ -14,14 +12,6 @@ pub type RequestId = i64;
 
 pub type ConfirmationId = i64;
 
-#[derive(Debug, Clone)]
-pub struct MessageToDeliverTcpContract {
-    pub id: MessageId,
-    pub attempt_no: i32,
-    pub headers: Option<HashMap<String, String>>,
-    pub content: Vec<u8>,
-}
-
 #[derive(Debug, Clone)]
 pub enum TcpContract {
     Ping,
@@ -53,7 +43,7 @@ pub enum TcpContract {
         topic_id: String,
         queue_id: String,
         confirmation_id: i64,
-        messages: Vec<MessageToDeliverTcpContract>,
+        messages: Vec<MySbMessageToDeliver>,
     },
     NewMessagesConfirmation {
         topic_id: String,

Diff for: src/tcp_serializers/messages_to_deliver.rs

@@ -1,7 +1,8 @@
+use my_service_bus_abstractions::subscriber::MySbMessageToDeliver;
 use my_service_bus_shared::MySbMessageContent;
 use my_tcp_sockets::socket_reader::{ReadingTcpContractFail, SocketReader};
 
-use crate::{MessageToDeliverTcpContract, PacketProtVer};
+use crate::PacketProtVer;
 
 pub fn serialize(
     dest: &mut Vec<u8>,
@@ -40,7 +41,7 @@ pub fn serialize_v3(dest: &mut Vec<u8>, msg: &MySbMessageContent, attempt_no: i3
 pub async fn deserialize<TSocketReader: SocketReader>(
     socket_reader: &mut TSocketReader,
     version: &PacketProtVer,
-) -> Result<MessageToDeliverTcpContract, ReadingTcpContractFail> {
+) -> Result<MySbMessageToDeliver, ReadingTcpContractFail> {
     if version.protocol_version < 3 {
         return deserialize_v2(socket_reader, version.packet_version).await;
     }
@@ -51,7 +52,7 @@ pub async fn deserialize<TSocketReader: SocketReader>(
 pub async fn deserialize_v2<TSocketReader: SocketReader>(
     socket_reader: &mut TSocketReader,
     packet_version: i32,
-) -> Result<MessageToDeliverTcpContract, ReadingTcpContractFail> {
+) -> Result<MySbMessageToDeliver, ReadingTcpContractFail> {
     let id = socket_reader.read_i64().await?;
 
     let attempt_no = if packet_version == 1 {
@@ -62,7 +63,7 @@ pub async fn deserialize_v2<TSocketReader: SocketReader>(
 
     let content = socket_reader.read_byte_array().await?;
 
-    let result = MessageToDeliverTcpContract {
+    let result = MySbMessageToDeliver {
         id,
         headers: None,
         attempt_no,
@@ -74,7 +75,7 @@ pub async fn deserialize_v2<TSocketReader: SocketReader>(
 
 pub async fn deserialize_v3<TSocketReader: SocketReader>(
     socket_reader: &mut TSocketReader,
-) -> Result<MessageToDeliverTcpContract, ReadingTcpContractFail> {
+) -> Result<MySbMessageToDeliver, ReadingTcpContractFail> {
     let id = socket_reader.read_i64().await?;
 
     let attempt_no = socket_reader.read_i32().await?;
@@ -83,7 +84,7 @@ pub async fn deserialize_v3<TSocketReader: SocketReader>(
 
     let content = socket_reader.read_byte_array().await?;
 
-    let result = MessageToDeliverTcpContract {
+    let result = MySbMessageToDeliver {
         id,
         headers,
         attempt_no,

Diff for: src/tcp_serializers/messages_to_publish.rs

@@ -1,4 +1,4 @@
-use my_service_bus_abstractions::MessageToPublish;
+use my_service_bus_abstractions::publisher::MessageToPublish;
 
 pub fn serialize(data: &mut Vec<u8>, v: &Vec<MessageToPublish>, protocol_version: i32) {
     if protocol_version < 3 {