network: Remove unnecessary "response" field.

Whether a packet is a request or a response is completely defined by
whether the packet is sent by the server or the client.

src/network/client.rs

@@ -129,7 +129,6 @@ async fn client_connection_task<StreamType, ErrorType, PacketType>(
                         let id = free_ids.alloc();
                         let packet = Packet {
                             id: id,
-                            response: false,
                             payload: call.data,
                         };
                         let mut serialized = Vec::new();
@@ -314,13 +313,12 @@ mod tests {
 
     type TestPayload = u32;
 
-    fn serialize_packet<T>(id: u32, response: bool, payload: T) -> Vec<u8>
+    fn serialize_packet<T>(id: u32, payload: T) -> Vec<u8>
     where
         T: Serialize,
     {
         let packet = Packet {
             id,
-            response,
             payload,
         };
         let mut serialized = Vec::new();
@@ -352,20 +350,20 @@ mod tests {
                 }),
                 tokio::spawn(async move {
                     // Invalid ID, should be ignored.
-                    pipe2.send(serialize_packet(42, true, 42)).await.unwrap();
+                    pipe2.send(serialize_packet(42, 42)).await.unwrap();
 
-                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(0, false, 42))));
-                    pipe2.send(serialize_packet(0, true, 1337)).await.unwrap();
+                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(0, 42))));
+                    pipe2.send(serialize_packet(0, 1337)).await.unwrap();
 
                     // Network errors shall be ignored if the stream is not closed.
                     pipe2.inject_error();
 
                     // The ID has to be reused, and a second concurrent call has to have a
                     // different ID.
-                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(0, false, 43))));
-                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(1, false, 44))));
-                    pipe2.send(serialize_packet(1, true, 1339)).await.unwrap();
-                    pipe2.send(serialize_packet(0, true, 1338)).await.unwrap();
+                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(0, 43))));
+                    assert_eq!(pipe2.next().await, Some(Ok(serialize_packet(1, 44))));
+                    pipe2.send(serialize_packet(1, 1339)).await.unwrap();
+                    pipe2.send(serialize_packet(0, 1338)).await.unwrap();
                 }),
             );
 
@@ -412,7 +410,7 @@ mod tests {
                     assert_eq!(events.next().await, None);
                 }),
                 tokio::spawn(async move {
-                    pipe2.send(serialize_packet(SERVER_EVENT_ID, false, 42)).await.unwrap();
+                    pipe2.send(serialize_packet(SERVER_EVENT_ID, 42)).await.unwrap();
                     drop(pipe2);
                 }),
             );
@@ -424,8 +422,7 @@ mod tests {
 
     // TODO:
     // - Test for unparseable response.
-    // - Test for server events.
-    // - Test wether the client correctly closes the connection and whether futures return an error
+    // - Test whether the client correctly closes the connection and whether futures return an error
     // in this case.
 }
 

src/network/mod.rs

@@ -8,10 +8,10 @@
 //! Remote procedure call:
 //! - The client allocates an ID from the range between 0..2^31-1 that is not currently in use
 //!   for another RPC in progress.
-//! - The client prepares a packet with this ID, "response = false", and the appropriate
-//!   payload and sends the packet to the server.
+//! - The client prepares a packet with this ID and the appropriate payload and sends the packet to
+//!   the server.
 //! - The server receives the packet, processes the request and sends a packet back with the
-//!   identical ID and "response = true".
+//!   identical ID.
 //! - In case of an error, the payload has the type "Error" which in turn contains the error
 //!   type.
 //! - Unpon reception of the response, the client is free to reuse the ID for further RPCs.
@@ -39,7 +39,6 @@ pub const SERVER_EVENT_ID: u32 = u32::max_value();
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct Packet<Payload> {
     pub id: u32,
-    pub response: bool, // TODO: Not really required.
     pub payload: Payload,
 }
 

src/protocol.rs

@@ -152,40 +152,35 @@ mod tests {
             (
                 Packet {
                     id: 42,
-                    response: false,
                     payload: PacketPayload::ServerInfo,
                 },
                 vec![
-                    131, 162, 105, 100, 42, 168, 114, 101, 115, 112, 111, 110, 115, 101, 194, 167,
-                    112, 97, 121, 108, 111, 97, 100, 129, 170, 83, 101, 114, 118, 101, 114, 73,
-                    110, 102, 111, 192,
+                    130, 162, 105, 100, 42, 167, 112, 97, 121, 108, 111, 97, 100, 129, 170, 83,
+                    101, 114, 118, 101, 114, 73, 110, 102, 111, 192,
                 ],
             ),
             (
                 Packet {
                     id: 42,
-                    response: true,
                     payload: PacketPayload::ServerInfoResponse(ServerInfoResponse {
                         version: "0.1".to_owned(),
                     }),
                 },
                 vec![
-                    131, 162, 105, 100, 42, 168, 114, 101, 115, 112, 111, 110, 115, 101, 195, 167,
-                    112, 97, 121, 108, 111, 97, 100, 129, 178, 83, 101, 114, 118, 101, 114, 73,
-                    110, 102, 111, 82, 101, 115, 112, 111, 110, 115, 101, 129, 167, 118, 101, 114,
-                    115, 105, 111, 110, 163, 48, 46, 49,
+                    130, 162, 105, 100, 42, 167, 112, 97, 121, 108, 111, 97, 100, 129, 178, 83,
+                    101, 114, 118, 101, 114, 73, 110, 102, 111, 82, 101, 115, 112, 111, 110, 115,
+                    101, 129, 167, 118, 101, 114, 115, 105, 111, 110, 163, 48, 46, 49,
                 ],
             ),
             (
                 Packet {
                     id: 42,
-                    response: true,
                     payload: PacketPayload::Error(crate::protocol::Error::InvalidParameter),
                 },
                 vec![
-                    131, 162, 105, 100, 42, 168, 114, 101, 115, 112, 111, 110, 115, 101, 195, 167,
-                    112, 97, 121, 108, 111, 97, 100, 129, 165, 69, 114, 114, 111, 114, 129, 176,
-                    73, 110, 118, 97, 108, 105, 100, 80, 97, 114, 97, 109, 101, 116, 101, 114, 192,
+                    130, 162, 105, 100, 42, 167, 112, 97, 121, 108, 111, 97, 100, 129, 165, 69,
+                    114, 114, 111, 114, 129, 176, 73, 110, 118, 97, 108, 105, 100, 80, 97, 114, 97,
+                    109, 101, 116, 101, 114, 192,
                 ],
             ),
         ];