refactor(starknet_sequencer_node): move ConfigPointersMap to starknet_sequencer_node

Author: nadin-Starkware

crates/starknet_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_revert_flow.rs

@@ -4,12 +4,12 @@ use std::time::Duration;
 use serde_json::Value;
 use starknet_api::block::BlockNumber;
 use starknet_infra_utils::test_utils::TestIdentifier;
-use starknet_integration_tests::executable_setup::ConfigPointersMap;
 use starknet_integration_tests::integration_test_manager::{
     IntegrationTestManager,
     BLOCK_TO_WAIT_FOR_BOOTSTRAP,
 };
 use starknet_integration_tests::integration_test_utils::integration_test_setup;
+use starknet_sequencer_node::config::definitions::ConfigPointersMap;
 use starknet_sequencer_node::config::node_config::SequencerNodeConfig;
 use tracing::info;
 

crates/starknet_integration_tests/src/executable_setup.rs

@@ -1,19 +1,11 @@
-use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 
 use blockifier::context::ChainInfo;
 use mempool_test_utils::starknet_api_test_utils::AccountTransactionGenerator;
 use papyrus_base_layer::ethereum_base_layer_contract::EthereumBaseLayerConfig;
-use papyrus_config::dumping::{
-    combine_config_map_and_pointers,
-    ConfigPointers,
-    Pointers,
-    SerializeConfig,
-};
-use papyrus_config::{ParamPath, SerializedContent, SerializedParam};
+use papyrus_config::dumping::{combine_config_map_and_pointers, SerializeConfig};
 use papyrus_storage::StorageConfig;
-use serde_json::Value;
 use starknet_api::execution_resources::GasAmount;
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::transaction::TransactionHash;
@@ -27,6 +19,7 @@ use starknet_monitoring_endpoint::config::MonitoringEndpointConfig;
 use starknet_monitoring_endpoint::test_utils::MonitoringClient;
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::config::config_utils::{config_to_preset, dump_json_data};
+use starknet_sequencer_node::config::definitions::ConfigPointersMap;
 use starknet_sequencer_node::config::node_config::{
     SequencerNodeConfig,
     CONFIG_NON_POINTERS_WHITELIST,
@@ -86,28 +79,6 @@ impl From<NodeExecutionId> for NodeRunner {
     }
 }
 
-#[derive(Clone)]
-pub struct ConfigPointersMap(HashMap<ParamPath, (SerializedParam, Pointers)>);
-
-impl ConfigPointersMap {
-    pub fn new(config_pointers: ConfigPointers) -> Self {
-        ConfigPointersMap(config_pointers.into_iter().map(|((k, v), p)| (k, (v, p))).collect())
-    }
-
-    pub fn change_target_value(&mut self, target: &str, value: Value) {
-        assert!(self.0.contains_key(target));
-        self.0.entry(target.to_owned()).and_modify(|(param, _)| {
-            param.content = SerializedContent::DefaultValue(value);
-        });
-    }
-}
-
-impl From<ConfigPointersMap> for ConfigPointers {
-    fn from(config_pointers_map: ConfigPointersMap) -> Self {
-        config_pointers_map.0.into_iter().map(|(k, (v, p))| ((k, v), p)).collect()
-    }
-}
-
 pub struct ExecutableSetup {
     // Node test identifier.
     pub node_execution_id: NodeExecutionId,

crates/starknet_integration_tests/src/integration_test_manager.rs

@@ -23,13 +23,14 @@ use starknet_infra_utils::test_utils::{AvailablePortsGenerator, TestIdentifier};
 use starknet_infra_utils::tracing::{CustomLogger, TraceLevel};
 use starknet_monitoring_endpoint::test_utils::MonitoringClient;
 use starknet_sequencer_node::config::config_utils::dump_json_data;
+use starknet_sequencer_node::config::definitions::ConfigPointersMap;
 use starknet_sequencer_node::config::node_config::SequencerNodeConfig;
 use starknet_sequencer_node::test_utils::node_runner::{get_node_executable_path, spawn_run_node};
 use tokio::join;
 use tokio::task::JoinHandle;
 use tracing::info;
 
-use crate::executable_setup::{ConfigPointersMap, ExecutableSetup, NodeExecutionId};
+use crate::executable_setup::{ExecutableSetup, NodeExecutionId};
 use crate::monitoring_utils::{
     await_batcher_block,
     await_block,

crates/starknet_integration_tests/src/utils.rs

@@ -56,14 +56,15 @@ use starknet_mempool::config::MempoolConfig;
 use starknet_mempool_p2p::config::MempoolP2pConfig;
 use starknet_monitoring_endpoint::config::MonitoringEndpointConfig;
 use starknet_sequencer_node::config::component_config::ComponentConfig;
+use starknet_sequencer_node::config::definitions::ConfigPointersMap;
 use starknet_sequencer_node::config::node_config::{SequencerNodeConfig, CONFIG_POINTERS};
 use starknet_state_sync::config::StateSyncConfig;
 use starknet_types_core::felt::Felt;
 use tokio::task::JoinHandle;
 use tracing::{debug, info, Instrument};
 use url::Url;
 
-use crate::executable_setup::{ConfigPointersMap, NodeExecutionId};
+use crate::executable_setup::NodeExecutionId;
 
 pub const ACCOUNT_ID_0: AccountId = 0;
 pub const ACCOUNT_ID_1: AccountId = 1;

crates/starknet_sequencer_node/src/config/definitions.rs

@@ -0,0 +1,27 @@
+use std::collections::HashMap;
+
+use papyrus_config::dumping::{ConfigPointers, Pointers};
+use papyrus_config::{ParamPath, SerializedContent, SerializedParam};
+use serde_json::Value;
+
+#[derive(Clone)]
+pub struct ConfigPointersMap(HashMap<ParamPath, (SerializedParam, Pointers)>);
+
+impl ConfigPointersMap {
+    pub fn new(config_pointers: ConfigPointers) -> Self {
+        ConfigPointersMap(config_pointers.into_iter().map(|((k, v), p)| (k, (v, p))).collect())
+    }
+
+    pub fn change_target_value(&mut self, target: &str, value: Value) {
+        assert!(self.0.contains_key(target));
+        self.0.entry(target.to_owned()).and_modify(|(param, _)| {
+            param.content = SerializedContent::DefaultValue(value);
+        });
+    }
+}
+
+impl From<ConfigPointersMap> for ConfigPointers {
+    fn from(config_pointers_map: ConfigPointersMap) -> Self {
+        config_pointers_map.0.into_iter().map(|(k, (v, p))| ((k, v), p)).collect()
+    }
+}

crates/starknet_sequencer_node/src/config/mod.rs

@@ -6,5 +6,6 @@ mod config_test;
 pub mod component_config;
 pub mod component_execution_config;
 pub mod config_utils;
+pub mod definitions;
 pub mod monitoring;
 pub mod node_config;