chore(ethexe): impl Clone for NetworkEvent (#4492)

gear-tech · Feb 7, 2025 · 6eb523f · 6eb523f
1 parent cfe2005
commit 6eb523f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/ethexe/network/src/db_sync/mod.rs b/ethexe/network/src/db_sync/mod.rs
@@ -92,7 +92,7 @@ enum ResponseValidationError {
     DataHashMismatch,
 }
 
-#[derive(Debug, Eq, PartialEq, Encode, Decode)]
+#[derive(Clone, Debug, Eq, PartialEq, Encode, Decode)]
 pub enum Response {
     /// Key (hash) - value (bytes) data
     DataForHashes(BTreeMap<H256, Vec<u8>>),
@@ -165,7 +165,7 @@ pub enum NewRequestRoundReason {
     PeerFailed,
 }
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum RequestFailure {
     /// Request exceeded its round limit
     OutOfRounds,

diff --git a/ethexe/network/src/db_sync/ongoing.rs b/ethexe/network/src/db_sync/ongoing.rs
@@ -74,7 +74,7 @@ pub(crate) enum ExternalValidation {
     },
 }
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ValidatingResponse {
     ongoing_request: OngoingRequest,
     peer_id: PeerId,
@@ -107,6 +107,20 @@ pub(crate) struct OngoingRequest {
     peer_score_handle: Handle,
 }
 
+impl Clone for OngoingRequest {
+    fn clone(&self) -> Self {
+        Self {
+            request_id: self.request_id,
+            original_request: self.original_request.clone(),
+            request: self.request.clone(),
+            response: self.response.clone(),
+            tried_peers: self.tried_peers.clone(),
+            timeout: Box::pin(time::sleep_until(self.timeout.deadline())),
+            peer_score_handle: self.peer_score_handle.clone(),
+        }
+    }
+}
+
 impl PartialEq for OngoingRequest {
     fn eq(&self, other: &Self) -> bool {
         self.request_id == other.request_id

diff --git a/ethexe/network/src/lib.rs b/ethexe/network/src/lib.rs
@@ -65,7 +65,7 @@ const MAX_ESTABLISHED_INCOMING_PER_PEER_CONNECTIONS: u32 = 1;
 const MAX_ESTABLISHED_OUTBOUND_PER_PEER_CONNECTIONS: u32 = 1;
 const MAX_ESTABLISHED_INCOMING_CONNECTIONS: u32 = 100;
 
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum NetworkEvent {
     Message {
         source: Option<PeerId>,