chore(starknet_sequencer_node): bundle all deployments in an array

Author: Itay-Tsabary-Starkware

crates/starknet_sequencer_node/src/bin/deployment_generator.rs

@@ -1,16 +1,14 @@
 use starknet_infra_utils::dumping::serialize_to_file;
-use starknet_sequencer_node::deployment_definitions::{
-    create_main_deployment,
-    create_testing_deployment,
-    MAIN_DEPLOYMENT_PRESET_PATH,
-    TESTING_DEPLOYMENT_PRESET_PATH,
-};
+use starknet_sequencer_node::deployment::DeploymentAndPreset;
+use starknet_sequencer_node::deployment_definitions::DEPLOYMENTS;
 
 // TODO(Tsabary): bundle deployment and its preset path together, and create a list of all of these
 // pairs. Then in the test, iterate over them and test each one.
 
 /// Creates the deployment json file.
 fn main() {
-    serialize_to_file(create_main_deployment(), MAIN_DEPLOYMENT_PRESET_PATH);
-    serialize_to_file(create_testing_deployment(), TESTING_DEPLOYMENT_PRESET_PATH);
+    for deployment_fn in DEPLOYMENTS {
+        let DeploymentAndPreset { deployment, dump_file_path } = deployment_fn();
+        serialize_to_file(deployment, dump_file_path);
+    }
 }

crates/starknet_sequencer_node/src/deployment.rs

@@ -15,6 +15,17 @@ use crate::config::component_execution_config::{
 
 const BASE_PORT: u16 = 55000; // TODO(Tsabary): arbitrary port, need to resolve.
 
+pub struct DeploymentAndPreset<'a> {
+    pub deployment: Deployment<'a>,
+    pub dump_file_path: &'static str,
+}
+
+impl<'a> DeploymentAndPreset<'a> {
+    pub fn new(deployment: Deployment<'a>, dump_file_path: &'static str) -> Self {
+        Self { deployment, dump_file_path }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct Deployment<'a> {
     chain_id: ChainId,

crates/starknet_sequencer_node/src/deployment_definitions.rs

@@ -1,6 +1,6 @@
 use starknet_api::core::ChainId;
 
-use crate::deployment::{Deployment, DeploymentName};
+use crate::deployment::{Deployment, DeploymentAndPreset, DeploymentName};
 
 #[cfg(test)]
 #[path = "deployment_definitions_test.rs"]
@@ -15,29 +15,31 @@ pub const SINGLE_NODE_CONFIG_PATH: &str =
     "config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json";
 
 // TODO(Tsabary): fill and order these.
-pub const MAIN_DEPLOYMENT_PRESET_PATH: &str = "config/sequencer/presets/main.json";
-pub const MAIN_DEPLOYMENT_APP_CONFIG_SUBDIR: &str =
-    "config/sequencer/presets/system_test_presets/single_node/";
-
-pub fn create_main_deployment() -> Deployment<'static> {
-    Deployment::new(
-        ChainId::Mainnet,
-        DEPLOYMENT_IMAGE,
-        MAIN_DEPLOYMENT_APP_CONFIG_SUBDIR,
-        DeploymentName::DistributedNode,
+
+type DeploymentFn = fn() -> DeploymentAndPreset<'static>;
+
+pub const DEPLOYMENTS: &[DeploymentFn] = &[create_main_deployment, create_testing_deployment];
+
+fn create_main_deployment() -> DeploymentAndPreset<'static> {
+    DeploymentAndPreset::new(
+        Deployment::new(
+            ChainId::Mainnet,
+            DEPLOYMENT_IMAGE,
+            "config/sequencer/presets/system_test_presets/single_node/",
+            DeploymentName::DistributedNode,
+        ),
+        "config/sequencer/presets/main.json",
     )
 }
 
-pub const TESTING_DEPLOYMENT_PRESET_PATH: &str =
-    "config/sequencer/deployment_configs/testing/nightly_test_all_in_one.json";
-pub const TESTING_DEPLOYMENT_APP_CONFIG_SUBDIR: &str =
-    "config/sequencer/presets/system_test_presets/single_node/";
-
-pub fn create_testing_deployment() -> Deployment<'static> {
-    Deployment::new(
-        ChainId::IntegrationSepolia,
-        DEPLOYMENT_IMAGE,
-        TESTING_DEPLOYMENT_APP_CONFIG_SUBDIR,
-        DeploymentName::ConsolidatedNode,
+fn create_testing_deployment() -> DeploymentAndPreset<'static> {
+    DeploymentAndPreset::new(
+        Deployment::new(
+            ChainId::IntegrationSepolia,
+            DEPLOYMENT_IMAGE,
+            "config/sequencer/presets/system_test_presets/single_node/",
+            DeploymentName::ConsolidatedNode,
+        ),
+        "config/sequencer/deployment_configs/testing/nightly_test_all_in_one.json",
     )
 }

crates/starknet_sequencer_node/src/deployment_definitions_test.rs

@@ -3,12 +3,8 @@ use std::env;
 use starknet_infra_utils::dumping::serialize_to_file_test;
 use starknet_infra_utils::path::resolve_project_relative_path;
 
-use crate::deployment_definitions::{
-    create_main_deployment,
-    create_testing_deployment,
-    MAIN_DEPLOYMENT_PRESET_PATH,
-    TESTING_DEPLOYMENT_PRESET_PATH,
-};
+use crate::deployment::DeploymentAndPreset;
+use crate::deployment_definitions::DEPLOYMENTS;
 
 // TODO(Tsabary): bundle deployment and its preset path together, and create a list of all of these
 // pairs. Then in the test, iterate over them and test each one.
@@ -17,15 +13,18 @@ use crate::deployment_definitions::{
 /// cargo run --bin deployment_generator -q
 #[test]
 fn deployment_files_are_up_to_date() {
-    serialize_to_file_test(create_main_deployment(), MAIN_DEPLOYMENT_PRESET_PATH);
-    serialize_to_file_test(create_testing_deployment(), TESTING_DEPLOYMENT_PRESET_PATH);
+    for deployment_fn in DEPLOYMENTS {
+        let DeploymentAndPreset { deployment, dump_file_path } = deployment_fn();
+        serialize_to_file_test(deployment, dump_file_path);
+    }
 }
 
 #[test]
 fn application_config_files_exist() {
     env::set_current_dir(resolve_project_relative_path("").unwrap())
         .expect("Couldn't set working dir.");
-    for deployment in &[create_main_deployment(), create_testing_deployment()] {
+    for deployment_fn in DEPLOYMENTS {
+        let DeploymentAndPreset { deployment, dump_file_path: _ } = deployment_fn();
         deployment.assert_application_configs_exist();
     }
 }