apollo_deployments: cleanups

Author: Itay-Tsabary-Starkware

Cargo.lock

@@ -11,10 +11,8 @@ workspace = true
 
 [dependencies]
 apollo_config.workspace = true
-apollo_http_server_config.workspace = true
 apollo_infra.workspace = true
 apollo_infra_utils.workspace = true
-apollo_monitoring_endpoint_config.workspace = true
 apollo_node_config.workspace = true
 phf = { workspace = true, features = ["macros"] }
 serde.workspace = true

crates/apollo_deployments/Cargo.toml

@@ -1,82 +1,22 @@
-use apollo_http_server_config::config::HTTP_SERVER_PORT;
-use apollo_monitoring_endpoint_config::config::MONITORING_ENDPOINT_DEFAULT_PORT;
 use apollo_node_config::component_execution_config::DEFAULT_INVALID_PORT;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use static_assertions::const_assert_ne;
-use strum::{EnumDiscriminants, EnumIter, IntoEnumIterator};
+use strum::EnumIter;
 use strum_macros::{AsRefStr, Display};
 
 #[cfg(test)]
 #[path = "deployment_definitions_test.rs"]
 mod deployment_definitions_test;
 
-// TODO(Tsabary): check if these ports are required.
-pub(crate) const CONSENSUS_P2P_PORT: u16 = 53080;
-pub(crate) const MEMPOOL_P2P_PORT: u16 = 53200;
-
 pub(crate) const CONFIG_BASE_DIR: &str = "crates/apollo_deployments/resources/";
-
-const BASE_APP_CONFIGS_DIR_PATH: &str = "crates/apollo_deployments/resources/app_configs";
-
 pub(crate) const INFRA_PORT_PLACEHOLDER: u16 = 1;
 const_assert_ne!(INFRA_PORT_PLACEHOLDER, DEFAULT_INVALID_PORT);
 
-#[derive(Clone, Debug, Serialize, PartialEq)]
-pub struct StateSyncConfig {
-    #[serde(rename = "state_sync_config.central_sync_client_config.#is_none")]
-    state_sync_config_central_sync_client_config_is_none: bool,
-    #[serde(rename = "state_sync_config.p2p_sync_client_config.#is_none")]
-    state_sync_config_p2p_sync_client_config_is_none: bool,
-    #[serde(rename = "state_sync_config.network_config.#is_none")]
-    state_sync_config_network_config_is_none: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum StateSyncType {
-    Central,
-    P2P,
-}
-
-impl StateSyncType {
-    pub fn get_state_sync_config(&self) -> StateSyncConfig {
-        match self {
-            StateSyncType::Central => StateSyncConfig {
-                state_sync_config_central_sync_client_config_is_none: false,
-                state_sync_config_p2p_sync_client_config_is_none: true,
-                state_sync_config_network_config_is_none: true,
-            },
-            StateSyncType::P2P => StateSyncConfig {
-                state_sync_config_central_sync_client_config_is_none: true,
-                state_sync_config_p2p_sync_client_config_is_none: false,
-                state_sync_config_network_config_is_none: false,
-            },
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, EnumIter, Display, Serialize, Ord, PartialEq, Eq, PartialOrd)]
-pub enum BusinessLogicServicePort {
-    ConsensusP2p,
-    HttpServer,
-    MempoolP2p,
-    MonitoringEndpoint,
-}
-
-impl BusinessLogicServicePort {
-    pub fn get_port(&self) -> u16 {
-        match self {
-            BusinessLogicServicePort::ConsensusP2p => CONSENSUS_P2P_PORT,
-            BusinessLogicServicePort::HttpServer => HTTP_SERVER_PORT,
-            BusinessLogicServicePort::MempoolP2p => MEMPOOL_P2P_PORT,
-            BusinessLogicServicePort::MonitoringEndpoint => MONITORING_ENDPOINT_DEFAULT_PORT,
-        }
-    }
-}
-
-// TODO(Tsabary): check if the InfraServicePort and BusinessLogicServicePort enums are needed.
+const BASE_APP_CONFIGS_DIR_PATH: &str = "crates/apollo_deployments/resources/app_configs";
 
 // TODO(Nadin): Integrate this logic with `ComponentConfigInService` once the merge from main-14.0
 // is complete.
+
 #[derive(Clone, Copy, Debug, EnumIter, Display, Serialize, Ord, PartialEq, Eq, PartialOrd)]
 pub enum InfraServicePort {
     Batcher,
@@ -97,39 +37,6 @@ impl InfraServicePort {
     }
 }
 
-#[derive(Clone, Copy, Debug, Display, Ord, PartialEq, Eq, PartialOrd, EnumDiscriminants)]
-pub enum ServicePort {
-    Infra(InfraServicePort),
-    BusinessLogic(BusinessLogicServicePort),
-}
-
-impl serde::Serialize for ServicePort {
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        match self {
-            ServicePort::Infra(port) => serde::Serialize::serialize(port, serializer),
-            ServicePort::BusinessLogic(port) => serde::Serialize::serialize(port, serializer),
-        }
-    }
-}
-
-impl ServicePort {
-    pub fn get_port(&self) -> u16 {
-        match self {
-            ServicePort::Infra(inner) => inner.get_port(),
-            ServicePort::BusinessLogic(inner) => inner.get_port(),
-        }
-    }
-
-    pub fn iter() -> impl Iterator<Item = ServicePort> {
-        InfraServicePort::iter()
-            .map(ServicePort::Infra)
-            .chain(BusinessLogicServicePort::iter().map(ServicePort::BusinessLogic))
-    }
-}
-
 #[derive(
     Hash, Clone, Debug, Display, Serialize, PartialEq, Eq, PartialOrd, Ord, EnumIter, AsRefStr,
 )]

crates/apollo_deployments/src/deployment_definitions.rs

@@ -8,7 +8,7 @@ use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-pub const HTTP_SERVER_PORT: u16 = 8080;
+const HTTP_SERVER_PORT: u16 = 8080;
 pub const DEFAULT_MAX_SIERRA_PROGRAM_SIZE: usize = 4 * 1024 * 1024; // 4MB
 const DEFAULT_DYNAMIC_CONFIG_POLL_INTERVAL_MS: u64 = 1_000; // 1 second.