apollo_deployments: more cleanups of old deployment code (#10719)

Author: Itay-Tsabary-Starkware

Cargo.lock

@@ -9,7 +9,6 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-alloy.workspace = true
 apollo_config.workspace = true
 apollo_http_server_config.workspace = true
 apollo_infra.workspace = true
@@ -22,7 +21,6 @@ phf = { workspace = true, features = ["macros"] }
 serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
-starknet_api.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 url.workspace = true

crates/apollo_deployments/Cargo.toml

@@ -8,7 +8,8 @@
 // {printf("\t\"%s\",\n", $NF)}'
 // ```
 
-pub(crate) const PEER_IDS: [&str; 40] = [
+#[allow(dead_code)]
+const PEER_IDS: [&str; 40] = [
     "12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
     "12D3KooWCPzcTZ4ymgyveYaFfZ4bfWsBEh2KxuxM3Rmy7MunqHwe",
     "12D3KooWT3eoCYeMPrSNnF1eQHimWFDiqPkna7FUD6XKBw8oPiMp",

crates/apollo_deployments/src/addresses.rs

@@ -1,21 +1,13 @@
 use std::fmt::{Display, Formatter, Result};
-use std::fs::read_to_string;
 use std::path::PathBuf;
 
-use alloy::primitives::Address as EthereumContractAddress;
 use apollo_http_server_config::config::HTTP_SERVER_PORT;
-use apollo_infra_utils::template::Template;
 use apollo_monitoring_endpoint_config::config::MONITORING_ENDPOINT_DEFAULT_PORT;
 use serde::{Deserialize, Serialize};
-use serde_json::from_str;
-use starknet_api::block::BlockNumber;
-use starknet_api::core::ContractAddress;
 use strum::{EnumDiscriminants, EnumIter, IntoEnumIterator};
-use strum_macros::{Display, EnumString};
-use url::Url;
+use strum_macros::Display;
 
-use crate::addresses::PEER_IDS;
-use crate::deployment::{Deployment, P2PCommunicationType};
+use crate::deployment::Deployment;
 use crate::deployment_definitions::testing::system_test_deployments;
 #[cfg(test)]
 #[path = "deployment_definitions_test.rs"]
@@ -46,55 +38,6 @@ pub(crate) const DEPLOYMENT_CONFIG_DIR_NAME: &str = "deployments/";
 
 const BASE_APP_CONFIGS_DIR_PATH: &str = "crates/apollo_deployments/resources/app_configs";
 
-pub(crate) type NodeAndValidatorId = (usize, String);
-
-#[derive(Debug, Deserialize)]
-pub struct DeploymentInputs {
-    pub node_and_validator_ids: Vec<NodeAndValidatorId>,
-    pub num_validators: usize,
-    pub http_server_ingress_alternative_name: String,
-    pub ingress_domain: String,
-    pub secret_name_format: Template,
-    pub node_namespace_format: Template,
-    pub starknet_contract_address: EthereumContractAddress,
-    pub chain_id_string: String,
-    pub eth_fee_token_address: ContractAddress,
-    pub starknet_gateway_url: Url,
-    pub strk_fee_token_address: ContractAddress,
-    pub l1_startup_height_override: Option<BlockNumber>,
-    pub state_sync_type: StateSyncType,
-    pub p2p_communication_type: P2PCommunicationType,
-    pub deployment_environment: Environment,
-    pub requires_k8s_service_config_params: bool,
-    pub audited_libfuncs_only: bool,
-    pub http_server_port: u16,
-    pub monitoring_endpoint_config_port: u16,
-    pub state_sync_config_rpc_config_port: u16,
-    pub mempool_p2p_config_network_config_port: u16,
-    pub consensus_manager_config_network_config_port: u16,
-}
-
-impl DeploymentInputs {
-    pub fn load_from_file(path: PathBuf) -> DeploymentInputs {
-        // Read the file into a string
-        let data = read_to_string(path).expect("Failed to read deployment input JSON file");
-
-        // Parse JSON into the DeploymentInputs struct
-        let deployment_inputs: Self =
-            from_str(&data).expect("Should be able to parse deployment input JSON");
-
-        for (node_id, _) in &deployment_inputs.node_and_validator_ids {
-            assert!(
-                *node_id < PEER_IDS.len(),
-                "Node node_id {node_id} exceeds the number of nodes {}",
-                PEER_IDS.len()
-            );
-        }
-
-        deployment_inputs
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Environment {
@@ -110,16 +53,6 @@ impl Display for Environment {
     }
 }
 
-#[derive(EnumString, Clone, Display, PartialEq, Debug, Serialize, Deserialize)]
-#[strum(serialize_all = "snake_case")]
-pub enum CloudK8sEnvironment {
-    Mainnet,
-    SepoliaIntegration,
-    SepoliaTestnet,
-    #[strum(serialize = "upgrade_test")]
-    UpgradeTest,
-}
-
 impl Environment {
     pub fn env_dir_path(&self) -> PathBuf {
         let env_str = match self {

crates/apollo_deployments/src/deployment_definitions.rs

@@ -1,8 +1,7 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::env;
 use std::fs::File;
 
-use alloy::primitives::map::HashSet;
 use apollo_infra_utils::dumping::{serialize_to_file, serialize_to_file_test};
 use apollo_infra_utils::path::resolve_project_relative_path;
 use apollo_node_config::config_utils::private_parameters;