refactor(starknet_sequencer_node): reordering of clients.rs (#3455)

commit-id:4dc6d3e5

Author: lev-starkware

crates/starknet_sequencer_node/src/clients.rs

@@ -60,13 +60,13 @@ use crate::config::node_config::SequencerNodeConfig;
 pub struct SequencerNodeClients {
     batcher_client: Client<BatcherRequest, BatcherResponse>,
     class_manager_client: Client<ClassManagerRequest, ClassManagerResponse>,
-    mempool_client: Client<MempoolRequest, MempoolResponse>,
     gateway_client: Client<GatewayRequest, GatewayResponse>,
+    l1_provider_client: Client<L1ProviderRequest, L1ProviderResponse>,
+    mempool_client: Client<MempoolRequest, MempoolResponse>,
     mempool_p2p_propagator_client:
         Client<MempoolP2pPropagatorRequest, MempoolP2pPropagatorResponse>,
     sierra_compiler_client: Client<SierraCompilerRequest, SierraCompilerResponse>,
     state_sync_client: Client<StateSyncRequest, StateSyncResponse>,
-    l1_provider_client: Client<L1ProviderRequest, L1ProviderResponse>,
 }
 
 /// A macro to retrieve a shared client wrapped in an `Arc`. The returned client is either the local
@@ -111,20 +111,15 @@ macro_rules! get_shared_client {
 }
 
 // TODO(Nadin): Refactor getters to remove code duplication.
-// TODO(Lev/Itay): Too many functions, need to be sorted in a meaningful way.
 impl SequencerNodeClients {
-    pub fn get_batcher_shared_client(&self) -> Option<SharedBatcherClient> {
-        get_shared_client!(self, batcher_client)
-    }
-
     pub fn get_batcher_local_client(
         &self,
     ) -> Option<LocalComponentClient<BatcherRequest, BatcherResponse>> {
         self.batcher_client.get_local_client()
     }
 
-    pub fn get_class_manager_shared_client(&self) -> Option<SharedClassManagerClient> {
-        get_shared_client!(self, class_manager_client)
+    pub fn get_batcher_shared_client(&self) -> Option<SharedBatcherClient> {
+        get_shared_client!(self, batcher_client)
     }
 
     pub fn get_class_manager_local_client(
@@ -133,26 +128,20 @@ impl SequencerNodeClients {
         self.class_manager_client.get_local_client()
     }
 
-    pub fn get_mempool_shared_client(&self) -> Option<SharedMempoolClient> {
-        get_shared_client!(self, mempool_client)
+    pub fn get_class_manager_shared_client(&self) -> Option<SharedClassManagerClient> {
+        get_shared_client!(self, class_manager_client)
     }
 
-    pub fn get_mempool_local_client(
+    pub fn get_gateway_local_client(
         &self,
-    ) -> Option<LocalComponentClient<MempoolRequest, MempoolResponse>> {
-        self.mempool_client.get_local_client()
+    ) -> Option<LocalComponentClient<GatewayRequest, GatewayResponse>> {
+        self.gateway_client.get_local_client()
     }
 
     pub fn get_gateway_shared_client(&self) -> Option<SharedGatewayClient> {
         get_shared_client!(self, gateway_client)
     }
 
-    pub fn get_gateway_local_client(
-        &self,
-    ) -> Option<LocalComponentClient<GatewayRequest, GatewayResponse>> {
-        self.gateway_client.get_local_client()
-    }
-
     pub fn get_l1_provider_local_client(
         &self,
     ) -> Option<LocalComponentClient<L1ProviderRequest, L1ProviderResponse>> {
@@ -163,10 +152,14 @@ impl SequencerNodeClients {
         get_shared_client!(self, l1_provider_client)
     }
 
-    pub fn get_mempool_p2p_propagator_shared_client(
+    pub fn get_mempool_local_client(
         &self,
-    ) -> Option<SharedMempoolP2pPropagatorClient> {
-        get_shared_client!(self, mempool_p2p_propagator_client)
+    ) -> Option<LocalComponentClient<MempoolRequest, MempoolResponse>> {
+        self.mempool_client.get_local_client()
+    }
+
+    pub fn get_mempool_shared_client(&self) -> Option<SharedMempoolClient> {
+        get_shared_client!(self, mempool_client)
     }
 
     pub fn get_mempool_p2p_propagator_local_client(
@@ -176,8 +169,10 @@ impl SequencerNodeClients {
         self.mempool_p2p_propagator_client.get_local_client()
     }
 
-    pub fn get_sierra_compiler_shared_client(&self) -> Option<SharedSierraCompilerClient> {
-        get_shared_client!(self, sierra_compiler_client)
+    pub fn get_mempool_p2p_propagator_shared_client(
+        &self,
+    ) -> Option<SharedMempoolP2pPropagatorClient> {
+        get_shared_client!(self, mempool_p2p_propagator_client)
     }
 
     pub fn get_sierra_compiler_local_client(
@@ -186,15 +181,19 @@ impl SequencerNodeClients {
         self.sierra_compiler_client.get_local_client()
     }
 
-    pub fn get_state_sync_shared_client(&self) -> Option<SharedStateSyncClient> {
-        get_shared_client!(self, state_sync_client)
+    pub fn get_sierra_compiler_shared_client(&self) -> Option<SharedSierraCompilerClient> {
+        get_shared_client!(self, sierra_compiler_client)
     }
 
     pub fn get_state_sync_local_client(
         &self,
     ) -> Option<LocalComponentClient<StateSyncRequest, StateSyncResponse>> {
         self.state_sync_client.get_local_client()
     }
+
+    pub fn get_state_sync_shared_client(&self) -> Option<SharedStateSyncClient> {
+        get_shared_client!(self, state_sync_client)
+    }
 }
 
 /// A macro for creating a component client fitting the component's execution mode. Returns a
@@ -263,6 +262,7 @@ pub fn create_node_clients(
         &config.components.batcher.remote_client_config,
         config.components.batcher.socket
     );
+
     let class_manager_client = create_client!(
         &config.components.class_manager.execution_mode,
         LocalClassManagerClient,
@@ -271,14 +271,7 @@ pub fn create_node_clients(
         &config.components.class_manager.remote_client_config,
         config.components.class_manager.socket
     );
-    let mempool_client = create_client!(
-        &config.components.mempool.execution_mode,
-        LocalMempoolClient,
-        RemoteMempoolClient,
-        channels.take_mempool_tx(),
-        &config.components.mempool.remote_client_config,
-        config.components.mempool.socket
-    );
+
     let gateway_client = create_client!(
         &config.components.gateway.execution_mode,
         LocalGatewayClient,
@@ -288,6 +281,24 @@ pub fn create_node_clients(
         config.components.gateway.socket
     );
 
+    let l1_provider_client = create_client!(
+        &config.components.l1_provider.execution_mode,
+        LocalL1ProviderClient,
+        RemoteL1ProviderClient,
+        channels.take_l1_provider_tx(),
+        &config.components.l1_provider.remote_client_config,
+        config.components.l1_provider.socket
+    );
+
+    let mempool_client = create_client!(
+        &config.components.mempool.execution_mode,
+        LocalMempoolClient,
+        RemoteMempoolClient,
+        channels.take_mempool_tx(),
+        &config.components.mempool.remote_client_config,
+        config.components.mempool.socket
+    );
+
     let mempool_p2p_propagator_client = create_client!(
         &config.components.mempool_p2p.execution_mode,
         LocalMempoolP2pPropagatorClient,
@@ -315,23 +326,14 @@ pub fn create_node_clients(
         config.components.state_sync.socket
     );
 
-    let l1_provider_client = create_client!(
-        &config.components.l1_provider.execution_mode,
-        LocalL1ProviderClient,
-        RemoteL1ProviderClient,
-        channels.take_l1_provider_tx(),
-        &config.components.l1_provider.remote_client_config,
-        config.components.l1_provider.socket
-    );
-
     SequencerNodeClients {
         batcher_client,
         class_manager_client,
-        mempool_client,
         gateway_client,
+        l1_provider_client,
+        mempool_client,
         mempool_p2p_propagator_client,
         sierra_compiler_client,
         state_sync_client,
-        l1_provider_client,
     }
 }