Move serialize methods out of the RequestCommon trait

Implementers shouldn't override it.

network-interface/src/request/mod.rs

@@ -138,7 +138,9 @@ pub trait RequestCommon:
     type Response: Deserialize + Serialize + Send;
     const MAX_REQUESTS: u32;
     const TIME_WINDOW: Duration = DEFAULT_MAX_REQUEST_RESPONSE_TIME_WINDOW;
+}
 
+pub trait RequestSerialize: RequestCommon {
     /// Serializes a request.
     /// A serialized request is composed of:
     /// - A varint for the Type ID of the request
@@ -177,6 +179,8 @@ pub trait RequestCommon:
     }
 }
 
+impl<T: RequestCommon> RequestSerialize for T {}
+
 pub trait Request: RequestCommon<Kind = RequestMarker> {}
 pub trait Message: RequestCommon<Kind = MessageMarker, Response = ()> {}
 

network-libp2p/src/network.rs

@@ -51,7 +51,7 @@ use nimiq_network_interface::{
     peer_info::{PeerInfo, Services},
     request::{
         peek_type, InboundRequestError, Message, OutboundRequestError, Request, RequestCommon,
-        RequestError, RequestType,
+        RequestError, RequestSerialize, RequestType,
     },
 };
 use nimiq_primitives::task_executor::TaskExecutor;

network-libp2p/tests/request_response.rs

@@ -21,7 +21,7 @@ use nimiq_network_libp2p::{
     discovery::{behaviour::DiscoveryConfig, peer_contacts::PeerContact},
     Config, Network, PeerId,
 };
-use nimiq_serde::{Deserialize, DeserializeError, Serialize};
+use nimiq_serde::{Deserialize, Serialize};
 use nimiq_test_log::test;
 use nimiq_utils::time::OffsetTime;
 use rand::{thread_rng, Rng};
@@ -50,27 +50,6 @@ impl RequestCommon for TestRequest {
     type Response = TestResponse;
 
     const MAX_REQUESTS: u32 = MAX_REQUEST_RESPONSE_TEST_REQUEST;
-
-    fn serialize_request(&self) -> Vec<u8> {
-        let mut data = Vec::with_capacity(self.serialized_request_size());
-        nimiq_network_interface::request::RequestType::from_request::<Self>()
-            .serialize_to_writer(&mut data)
-            .unwrap();
-        Serialize::serialize_to_writer(self, &mut data).unwrap();
-        data
-    }
-
-    fn deserialize_request(buffer: &[u8]) -> Result<Self, DeserializeError> {
-        // Check for correct type.
-        let (ty, message_buf) = <u16>::deserialize_take(buffer)?;
-        if ty != nimiq_network_interface::request::RequestType::from_request::<Self>().0 {
-            return Err(DeserializeError::bad_encoding());
-        }
-
-        let message: Self = Deserialize::deserialize_from_vec(message_buf)?;
-
-        Ok(message)
-    }
 }
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 struct TestResponse {

network-mock/src/network.rs

@@ -15,7 +15,7 @@ use nimiq_network_interface::{
     peer_info::{PeerInfo, Services},
     request::{
         InboundRequestError, Message, OutboundRequestError, Request, RequestCommon, RequestError,
-        RequestKind, RequestType,
+        RequestKind, RequestSerialize, RequestType,
     },
 };
 use nimiq_serde::{Deserialize, DeserializeError, Serialize};