apollo_integration_tests: set only required configs for nodes (#8425)

Author: Itay-Tsabary-Starkware

crates/apollo_integration_tests/src/utils.rs

@@ -38,6 +38,7 @@ use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
 use apollo_network::network_manager::test_utils::create_connected_network_configs;
 use apollo_network::NetworkConfig;
 use apollo_node::config::component_config::ComponentConfig;
+use apollo_node::config::component_execution_config::ExpectedComponentConfig;
 use apollo_node::config::definitions::ConfigPointersMap;
 use apollo_node::config::monitoring::MonitoringConfig;
 use apollo_node::config::node_config::{SequencerNodeConfig, CONFIG_POINTERS};
@@ -255,23 +256,43 @@ pub fn create_node_config(
         to_value(starknet_url).expect("Failed to serialize starknet_url"),
     );
 
+    // A helper macro that wraps the config in `Some(...)` if `components.<field>` expects it;
+    // otherwise returns `None`. Assumes `components` is in scope.
+    macro_rules! wrap_if_component_config_expected {
+        ($component_field:ident, $config_field:expr) => {{
+            if components.$component_field.is_component_config_expected() {
+                Some($config_field)
+            } else {
+                None
+            }
+        }};
+    }
+
+    // Retain only the required configs.
     let base_layer_config = Some(base_layer_config);
-    let batcher_config = Some(batcher_config);
-    let class_manager_config = Some(class_manager_config);
-    let consensus_manager_config = Some(consensus_manager_config);
-    let gateway_config = Some(gateway_config);
-    let http_server_config = Some(http_server_config);
-    let l1_endpoint_monitor_config = Some(l1_endpoint_monitor_config);
-    let l1_gas_price_provider_config = Some(l1_gas_price_provider_config);
-    let l1_gas_price_scraper_config = Some(l1_gas_price_scraper_config);
-    let l1_provider_config = Some(l1_provider_config);
-    let l1_scraper_config = Some(l1_scraper_config);
-    let mempool_config = Some(mempool_config);
-    let mempool_p2p_config = Some(mempool_p2p_config);
-    let monitoring_endpoint_config = Some(monitoring_endpoint_config);
+    let batcher_config = wrap_if_component_config_expected!(batcher, batcher_config);
+    let class_manager_config =
+        wrap_if_component_config_expected!(class_manager, class_manager_config);
+    let consensus_manager_config =
+        wrap_if_component_config_expected!(consensus_manager, consensus_manager_config);
+    let gateway_config = wrap_if_component_config_expected!(gateway, gateway_config);
+    let http_server_config = wrap_if_component_config_expected!(http_server, http_server_config);
+    let l1_endpoint_monitor_config =
+        wrap_if_component_config_expected!(l1_endpoint_monitor, l1_endpoint_monitor_config);
+    let l1_gas_price_provider_config =
+        wrap_if_component_config_expected!(l1_gas_price_provider, l1_gas_price_provider_config);
+    let l1_gas_price_scraper_config =
+        wrap_if_component_config_expected!(l1_gas_price_scraper, l1_gas_price_scraper_config);
+    let l1_provider_config = wrap_if_component_config_expected!(l1_provider, l1_provider_config);
+    let l1_scraper_config = wrap_if_component_config_expected!(l1_scraper, l1_scraper_config);
+    let mempool_config = wrap_if_component_config_expected!(mempool, mempool_config);
+    let mempool_p2p_config = wrap_if_component_config_expected!(mempool_p2p, mempool_p2p_config);
+    let monitoring_endpoint_config =
+        wrap_if_component_config_expected!(monitoring_endpoint, monitoring_endpoint_config);
     let monitoring_config = MonitoringConfig::default();
-    let sierra_compiler_config = Some(sierra_compiler_config);
-    let state_sync_config = Some(state_sync_config);
+    let sierra_compiler_config =
+        wrap_if_component_config_expected!(sierra_compiler, sierra_compiler_config);
+    let state_sync_config = wrap_if_component_config_expected!(state_sync, state_sync_config);
 
     let sequencer_node_config = SequencerNodeConfig {
         base_layer_config,
@@ -328,7 +349,7 @@ pub(crate) fn create_consensus_manager_configs_from_network_configs(
                 builder_address: ContractAddress::from(4_u128),
                 ..Default::default()
             },
-            cende_config: CendeConfig{
+            cende_config: CendeConfig {
                 skip_write_height: Some(BlockNumber(1)),
                 ..Default::default()
             },

crates/apollo_node/src/config/component_execution_config.rs

@@ -17,6 +17,10 @@ const DEFAULT_INVALID_PORT: u16 = 0;
 
 pub const MAX_CONCURRENCY: usize = 8;
 
+pub trait ExpectedComponentConfig {
+    fn is_component_config_expected(&self) -> bool;
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum ReactiveComponentExecutionMode {
     Disabled,
@@ -25,12 +29,33 @@ pub enum ReactiveComponentExecutionMode {
     LocalExecutionWithRemoteDisabled,
 }
 
+impl ExpectedComponentConfig for ReactiveComponentExecutionMode {
+    fn is_component_config_expected(&self) -> bool {
+        match self {
+            ReactiveComponentExecutionMode::Disabled | ReactiveComponentExecutionMode::Remote => {
+                false
+            }
+            ReactiveComponentExecutionMode::LocalExecutionWithRemoteEnabled
+            | ReactiveComponentExecutionMode::LocalExecutionWithRemoteDisabled => true,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum ActiveComponentExecutionMode {
     Disabled,
     Enabled,
 }
 
+impl ExpectedComponentConfig for ActiveComponentExecutionMode {
+    fn is_component_config_expected(&self) -> bool {
+        match self {
+            ActiveComponentExecutionMode::Disabled => false,
+            ActiveComponentExecutionMode::Enabled => true,
+        }
+    }
+}
+
 /// Reactive component configuration.
 #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)]
 #[validate(schema(function = "validate_reactive_component_execution_config"))]
@@ -154,6 +179,12 @@ impl ReactiveComponentExecutionConfig {
     }
 }
 
+impl ExpectedComponentConfig for ReactiveComponentExecutionConfig {
+    fn is_component_config_expected(&self) -> bool {
+        self.execution_mode.is_component_config_expected()
+    }
+}
+
 /// Active component configuration.
 #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)]
 #[validate(schema(function = "validate_active_component_execution_config"))]
@@ -178,6 +209,12 @@ impl Default for ActiveComponentExecutionConfig {
     }
 }
 
+impl ExpectedComponentConfig for ActiveComponentExecutionConfig {
+    fn is_component_config_expected(&self) -> bool {
+        self.execution_mode.is_component_config_expected()
+    }
+}
+
 impl ActiveComponentExecutionConfig {
     pub fn disabled() -> Self {
         Self { execution_mode: ActiveComponentExecutionMode::Disabled }

crates/apollo_node/src/config/config_utils.rs

@@ -6,12 +6,10 @@ use apollo_config::dumping::{combine_config_map_and_pointers, Pointers, Serializ
 use apollo_config::{ParamPath, SerializedParam};
 use apollo_infra_utils::dumping::serialize_to_file;
 use apollo_infra_utils::path::resolve_project_relative_path;
-use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
 use serde_json::{Map, Value};
 use tracing::error;
 use validator::ValidationError;
 
-use crate::config::component_config::ComponentConfig;
 use crate::config::definitions::ConfigPointersMap;
 use crate::config::node_config::{
     SequencerNodeConfig,
@@ -121,20 +119,6 @@ fn validate_all_pointer_targets_set(preset: Value) -> Result<(), ValidationError
     }
 }
 
-pub struct BaseAppConfigOverride {
-    component_config: ComponentConfig,
-    monitoring_endpoint_config: Option<MonitoringEndpointConfig>,
-}
-
-impl BaseAppConfigOverride {
-    pub fn new(
-        component_config: ComponentConfig,
-        monitoring_endpoint_config: Option<MonitoringEndpointConfig>,
-    ) -> Self {
-        Self { component_config, monitoring_endpoint_config }
-    }
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct DeploymentBaseAppConfig {
     pub config: SequencerNodeConfig,
@@ -173,12 +157,6 @@ impl DeploymentBaseAppConfig {
         modify_config_pointers_fn(&mut self.config_pointers_map);
     }
 
-    pub fn override_base_app_config(&mut self, base_app_config_override: BaseAppConfigOverride) {
-        self.config.components = base_app_config_override.component_config;
-        self.config.monitoring_endpoint_config =
-            base_app_config_override.monitoring_endpoint_config;
-    }
-
     pub fn as_value(&self) -> Value {
         // Create the entire mapping of the config and the pointers, without the required params.
         let config_as_map = combine_config_map_and_pointers(