diff --git a/crates/apollo_integration_tests/src/flow_test_setup.rs b/crates/apollo_integration_tests/src/flow_test_setup.rs index 2c237c79964..64aa6f96af3 100644 --- a/crates/apollo_integration_tests/src/flow_test_setup.rs +++ b/crates/apollo_integration_tests/src/flow_test_setup.rs @@ -8,7 +8,7 @@ use apollo_consensus_manager_config::config::ConsensusManagerConfig; use apollo_http_server::test_utils::HttpTestClient; use apollo_infra::metrics::{metrics_recorder, MetricsConfig}; use apollo_infra_utils::test_utils::AvailablePorts; -use apollo_l1_gas_price_config::config::EthToStrkOracleConfig; +use apollo_l1_gas_price_config::config::PriceOracleConfig; use apollo_mempool_p2p_config::config::MempoolP2pConfig; use apollo_monitoring_endpoint::test_utils::MonitoringClient; use apollo_monitoring_endpoint_config::config::MonitoringEndpointConfig; @@ -257,7 +257,7 @@ impl FlowSequencerSetup { let (eth_to_strk_oracle_url_headers, _join_handle) = spawn_local_eth_to_strk_oracle(available_ports.get_next_port()); - let eth_to_strk_oracle_config = EthToStrkOracleConfig { + let eth_to_strk_oracle_config = PriceOracleConfig { url_header_list: Some(vec![eth_to_strk_oracle_url_headers.into()]), ..Default::default() }; diff --git a/crates/apollo_integration_tests/src/integration_test_manager.rs b/crates/apollo_integration_tests/src/integration_test_manager.rs index db97eac0e4c..61a8d591009 100644 --- a/crates/apollo_integration_tests/src/integration_test_manager.rs +++ b/crates/apollo_integration_tests/src/integration_test_manager.rs @@ -11,7 +11,7 @@ use apollo_http_server::test_utils::HttpTestClient; use apollo_infra_utils::dumping::serialize_to_file; use apollo_infra_utils::test_utils::{AvailablePortsGenerator, TestIdentifier}; use apollo_infra_utils::tracing::{CustomLogger, TraceLevel}; -use apollo_l1_gas_price_config::config::{EthToStrkOracleConfig, L1GasPriceScraperConfig}; +use apollo_l1_gas_price_config::config::{L1GasPriceScraperConfig, PriceOracleConfig}; use apollo_monitoring_endpoint::test_utils::MonitoringClient; use apollo_monitoring_endpoint_config::config::MonitoringEndpointConfig; use apollo_network::network_manager::test_utils::create_connected_network_configs; @@ -1312,7 +1312,7 @@ async fn get_sequencer_setup_configs( let state_sync_config = state_sync_configs.remove(0); consensus_manager_config.cende_config.recorder_url = recorder_url.clone(); - let eth_to_strk_oracle_config = EthToStrkOracleConfig { + let eth_to_strk_oracle_config = PriceOracleConfig { url_header_list: Some(vec![eth_to_strk_oracle_url.clone().into()]), ..Default::default() }; diff --git a/crates/apollo_integration_tests/src/utils.rs b/crates/apollo_integration_tests/src/utils.rs index 1d282540924..8fdfdade622 100644 --- a/crates/apollo_integration_tests/src/utils.rs +++ b/crates/apollo_integration_tests/src/utils.rs @@ -53,9 +53,9 @@ use apollo_infra_utils::test_utils::{AvailablePorts, TestIdentifier}; use apollo_l1_events_config::config::{L1EventsProviderConfig, L1EventsScraperConfig}; use apollo_l1_gas_price::eth_to_strk_oracle::ETH_TO_STRK_QUANTIZATION; use apollo_l1_gas_price_config::config::{ - EthToStrkOracleConfig, L1GasPriceProviderConfig, L1GasPriceScraperConfig, + PriceOracleConfig, }; use apollo_l1_gas_price_types::DEFAULT_ETH_TO_FRI_RATE; use apollo_mempool_config::config::{MempoolConfig, MempoolDynamicConfig, MempoolStaticConfig}; @@ -226,7 +226,7 @@ pub fn create_node_config( storage_config: StorageTestConfig, mut state_sync_config: StateSyncConfig, mut consensus_manager_config: ConsensusManagerConfig, - eth_to_strk_oracle_config: EthToStrkOracleConfig, + eth_to_strk_oracle_config: PriceOracleConfig, mempool_p2p_config: MempoolP2pConfig, monitoring_endpoint_config: MonitoringEndpointConfig, components: ComponentConfig, diff --git a/crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs b/crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs index 8d4b8187402..71faa7a6893 100644 --- a/crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs +++ b/crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs @@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use apollo_config::secrets::Sensitive; -use apollo_l1_gas_price_config::config::EthToStrkOracleConfig; +use apollo_l1_gas_price_config::config::PriceOracleConfig; use apollo_l1_gas_price_types::errors::PriceOracleClientError; use apollo_l1_gas_price_types::PriceOracleClientTrait; use apollo_metrics::metrics::set_unix_now_seconds; @@ -57,7 +57,7 @@ type PriceQuery = AbortOnDropHandle>; /// Client for interacting with the eth to strk Oracle API. #[derive(Clone, Debug)] pub struct EthToStrkOracleClient { - config: EthToStrkOracleConfig, + config: PriceOracleConfig, /// The index of the current URL in the `url_header_list`. /// If one URL fails, index is incremented to try the next URL. index: Arc, @@ -68,7 +68,7 @@ pub struct EthToStrkOracleClient { } impl EthToStrkOracleClient { - pub fn new(config: EthToStrkOracleConfig) -> Self { + pub fn new(config: PriceOracleConfig) -> Self { info!( "Creating EthToStrkOracleClient with: urls={:?} lag_interval_seconds={}", config.url_header_list, config.lag_interval_seconds diff --git a/crates/apollo_l1_gas_price/src/eth_to_strk_oracle_test.rs b/crates/apollo_l1_gas_price/src/eth_to_strk_oracle_test.rs index 528736c3112..cb5486b3b65 100644 --- a/crates/apollo_l1_gas_price/src/eth_to_strk_oracle_test.rs +++ b/crates/apollo_l1_gas_price/src/eth_to_strk_oracle_test.rs @@ -9,7 +9,7 @@ use serde_json::json; use tokio::{self}; use url::Url; -use crate::eth_to_strk_oracle::{EthToStrkOracleClient, EthToStrkOracleConfig}; +use crate::eth_to_strk_oracle::{EthToStrkOracleClient, PriceOracleConfig}; async fn make_server(server: &mut ServerGuard, body: serde_json::Value) -> Mock { server @@ -52,7 +52,7 @@ async fn eth_to_fri_rate_uses_cache_on_quantized_hit() { headers: BTreeMap::new(), // No additional headers needed for this test. }; let url_header_list = Some(vec![url_and_headers.into()]); - let config = EthToStrkOracleConfig { + let config = PriceOracleConfig { url_header_list, lag_interval_seconds: LAG_INTERVAL_SECONDS, ..Default::default() @@ -126,7 +126,7 @@ async fn eth_to_fri_rate_uses_prev_cache_when_query_not_ready() { headers: BTreeMap::new(), // No additional headers needed for this test. }; let url_header_list = Some(vec![url_and_headers.into()]); - let config = EthToStrkOracleConfig { + let config = PriceOracleConfig { url_header_list, lag_interval_seconds: LAG_INTERVAL_SECONDS, ..Default::default() @@ -187,7 +187,7 @@ async fn eth_to_fri_rate_two_urls() { } .into(), ]); - let config = EthToStrkOracleConfig { + let config = PriceOracleConfig { url_header_list, lag_interval_seconds: LAG_INTERVAL_SECONDS, ..Default::default() diff --git a/crates/apollo_l1_gas_price_config/src/config.rs b/crates/apollo_l1_gas_price_config/src/config.rs index fdd7ba2b405..0dae6e1da1c 100644 --- a/crates/apollo_l1_gas_price_config/src/config.rs +++ b/crates/apollo_l1_gas_price_config/src/config.rs @@ -22,7 +22,7 @@ use url::Url; use validator::Validate; #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Validate)] -pub struct EthToStrkOracleConfig { +pub struct PriceOracleConfig { #[serde(deserialize_with = "deserialize_optional_sensitive_list_with_url_and_headers")] pub url_header_list: Option>>, pub lag_interval_seconds: u64, @@ -30,7 +30,7 @@ pub struct EthToStrkOracleConfig { pub query_timeout_sec: u64, } -impl SerializeConfig for EthToStrkOracleConfig { +impl SerializeConfig for PriceOracleConfig { fn dump(&self) -> BTreeMap { BTreeMap::from_iter([ ser_param( @@ -73,7 +73,7 @@ impl SerializeConfig for EthToStrkOracleConfig { } } -impl Default for EthToStrkOracleConfig { +impl Default for PriceOracleConfig { fn default() -> Self { Self { url_header_list: Some(vec![ @@ -102,7 +102,7 @@ pub struct L1GasPriceProviderConfig { // Maximum valid time gap between the requested timestamp and the last price sample in seconds. pub max_time_gap_seconds: u64, #[validate(nested)] - pub eth_to_strk_oracle_config: EthToStrkOracleConfig, + pub eth_to_strk_oracle_config: PriceOracleConfig, } impl Default for L1GasPriceProviderConfig { @@ -113,7 +113,7 @@ impl Default for L1GasPriceProviderConfig { lag_margin_seconds: Duration::from_secs(60), storage_limit: usize::try_from(10 * MEAN_NUMBER_OF_BLOCKS).unwrap(), max_time_gap_seconds: 900, // 15 minutes - eth_to_strk_oracle_config: EthToStrkOracleConfig::default(), + eth_to_strk_oracle_config: PriceOracleConfig::default(), } } }