chore: move test components' enums to common

starkware-libs · Jul 9, 2024 · ab45d5d · ab45d5d
1 parent f98e476
commit ab45d5d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 45 deletions.
diff --git a/crates/mempool_infra/tests/common/mod.rs b/crates/mempool_infra/tests/common/mod.rs
@@ -1,4 +1,5 @@
 use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
 use starknet_mempool_infra::component_client::ClientResult;
 
 pub(crate) type ValueA = u32;
@@ -9,6 +10,26 @@ pub(crate) type ResultB = ClientResult<ValueB>;
 
 // TODO(Tsabary): add more messages / functions to the components.
 
+#[derive(Serialize, Deserialize, Debug)]
+pub enum ComponentARequest {
+    AGetValue,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum ComponentAResponse {
+    Value(ValueA),
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum ComponentBRequest {
+    BGetValue,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum ComponentBResponse {
+    Value(ValueB),
+}
+
 #[async_trait]
 pub(crate) trait ComponentAClientTrait: Send + Sync {
     async fn a_get_value(&self) -> ResultA;

diff --git a/crates/mempool_infra/tests/component_server_client_http_test.rs b/crates/mempool_infra/tests/component_server_client_http_test.rs
@@ -4,10 +4,13 @@ use std::net::{IpAddr, Ipv6Addr, SocketAddr};
 
 use async_trait::async_trait;
 use bincode::serialize;
-use common::{ComponentAClientTrait, ComponentBClientTrait, ResultA, ResultB};
+use common::{
+    ComponentAClientTrait, ComponentARequest, ComponentAResponse, ComponentBClientTrait,
+    ComponentBRequest, ComponentBResponse, ResultA, ResultB,
+};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Request, Response, Server, StatusCode};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use starknet_mempool_infra::component_client::ComponentClientHttp;
 use starknet_mempool_infra::component_definitions::{ComponentRequestHandler, ServerError};
 use starknet_mempool_infra::component_server::ComponentServerHttp;
@@ -25,18 +28,6 @@ const UNCONNECTED_SERVER_PORT: u16 = 10002;
 const FAULTY_SERVER_REQ_DESER_PORT: u16 = 10003;
 const FAULTY_SERVER_RES_DESER_PORT: u16 = 10004;
 
-// Todo(uriel): Move to common
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ComponentARequest {
-    AGetValue,
-}
-
-// Todo(uriel): Move to common
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ComponentAResponse {
-    Value(ValueA),
-}
-
 #[async_trait]
 impl ComponentAClientTrait for ComponentClientHttp<ComponentARequest, ComponentAResponse> {
     async fn a_get_value(&self) -> ResultA {
@@ -55,18 +46,6 @@ impl ComponentRequestHandler<ComponentARequest, ComponentAResponse> for Componen
     }
 }
 
-// Todo(uriel): Move to common
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ComponentBRequest {
-    BGetValue,
-}
-
-// Todo(uriel): Move to common
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ComponentBResponse {
-    Value(ValueB),
-}
-
 #[async_trait]
 impl ComponentBClientTrait for ComponentClientHttp<ComponentBRequest, ComponentBResponse> {
     async fn b_get_value(&self) -> ResultB {

diff --git a/crates/mempool_infra/tests/component_server_client_test.rs b/crates/mempool_infra/tests/component_server_client_test.rs
@@ -1,7 +1,10 @@
 mod common;
 
 use async_trait::async_trait;
-use common::{ComponentAClientTrait, ComponentBClientTrait, ResultA, ResultB};
+use common::{
+    ComponentAClientTrait, ComponentARequest, ComponentAResponse, ComponentBClientTrait,
+    ComponentBRequest, ComponentBResponse, ResultA, ResultB,
+};
 use starknet_mempool_infra::component_client::ComponentClient;
 use starknet_mempool_infra::component_definitions::{
     ComponentRequestAndResponseSender, ComponentRequestHandler,
@@ -14,14 +17,6 @@ use crate::common::{ComponentA, ComponentB, ValueA, ValueB};
 
 // TODO(Tsabary): send messages from component b to component a.
 
-pub enum ComponentARequest {
-    AGetValue,
-}
-
-pub enum ComponentAResponse {
-    Value(ValueA),
-}
-
 #[async_trait]
 impl ComponentAClientTrait for ComponentClient<ComponentARequest, ComponentAResponse> {
     async fn a_get_value(&self) -> ResultA {
@@ -41,16 +36,6 @@ impl ComponentRequestHandler<ComponentARequest, ComponentAResponse> for Componen
     }
 }
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ComponentBRequest {
-    BGetValue,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ComponentBResponse {
-    Value(ValueB),
-}
-
 #[async_trait]
 impl ComponentBClientTrait for ComponentClient<ComponentBRequest, ComponentBResponse> {
     async fn b_get_value(&self) -> ResultB {