apollo_l1_gas_price_types: rename EthToStrkOracleClientTrait to PriceOracleClientTrait

Author: sirandreww-starkware

crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 use apollo_config::secrets::Sensitive;
 use apollo_l1_gas_price_config::config::EthToStrkOracleConfig;
 use apollo_l1_gas_price_types::errors::PriceOracleClientError;
-use apollo_l1_gas_price_types::EthToStrkOracleClientTrait;
+use apollo_l1_gas_price_types::PriceOracleClientTrait;
 use apollo_metrics::metrics::set_unix_now_seconds;
 use async_trait::async_trait;
 use futures::FutureExt;
@@ -188,7 +188,7 @@ fn resolve_query(body: String) -> Result<u128, PriceOracleClientError> {
 }
 
 #[async_trait]
-impl EthToStrkOracleClientTrait for EthToStrkOracleClient {
+impl PriceOracleClientTrait for EthToStrkOracleClient {
     /// The HTTP response must include the following fields:
     /// - `price`: a hexadecimal string representing the price.
     /// - `decimals`: a `u64` value, must be equal to `ETH_TO_STRK_QUANTIZATION`.

crates/apollo_l1_gas_price/src/eth_to_strk_oracle_test.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 
 use apollo_config::converters::UrlAndHeaders;
 use apollo_l1_gas_price_types::errors::PriceOracleClientError;
-use apollo_l1_gas_price_types::EthToStrkOracleClientTrait;
+use apollo_l1_gas_price_types::PriceOracleClientTrait;
 use mockito::{Mock, ServerGuard};
 use serde_json::json;
 use tokio::{self};

crates/apollo_l1_gas_price/src/l1_gas_price_provider.rs

@@ -7,10 +7,10 @@ use apollo_infra_utils::info_every_n_ms;
 use apollo_l1_gas_price_config::config::L1GasPriceProviderConfig;
 use apollo_l1_gas_price_types::errors::L1GasPriceProviderError;
 use apollo_l1_gas_price_types::{
-    EthToStrkOracleClientTrait,
     GasPriceData,
     L1GasPriceProviderResult,
     PriceInfo,
+    PriceOracleClientTrait,
 };
 use async_trait::async_trait;
 use starknet_api::block::BlockTimestamp;
@@ -58,13 +58,13 @@ pub struct L1GasPriceProvider {
     config: L1GasPriceProviderConfig,
     // If received data before initialization (is None), it means the scraper has restarted.
     price_samples_by_block: Option<RingBuffer<GasPriceData>>,
-    eth_to_strk_oracle_client: Arc<dyn EthToStrkOracleClientTrait>,
+    eth_to_strk_oracle_client: Arc<dyn PriceOracleClientTrait>,
 }
 
 impl L1GasPriceProvider {
     pub fn new(
         config: L1GasPriceProviderConfig,
-        eth_to_strk_oracle_client: Arc<dyn EthToStrkOracleClientTrait>,
+        eth_to_strk_oracle_client: Arc<dyn PriceOracleClientTrait>,
     ) -> Self {
         Self { config, price_samples_by_block: None, eth_to_strk_oracle_client }
     }

crates/apollo_l1_gas_price/src/l1_gas_price_provider_test.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use apollo_l1_gas_price_config::config::L1GasPriceProviderConfig;
-use apollo_l1_gas_price_types::{GasPriceData, MockEthToStrkOracleClientTrait, PriceInfo};
+use apollo_l1_gas_price_types::{GasPriceData, MockPriceOracleClientTrait, PriceInfo};
 use starknet_api::block::{BlockTimestamp, GasPrice};
 
 use crate::l1_gas_price_provider::{L1GasPriceProvider, L1GasPriceProviderError};
@@ -10,7 +10,7 @@ use crate::l1_gas_price_provider::{L1GasPriceProvider, L1GasPriceProviderError};
 // To get the prices for the middle three blocks use the timestamp for block[3].
 // Returns the provider, a vector of block prices to compare with, and the timestamp of block[3].
 fn make_provider() -> (L1GasPriceProvider, Vec<PriceInfo>, u64) {
-    let eth_to_strk_oracle_client = Arc::new(MockEthToStrkOracleClientTrait::new());
+    let eth_to_strk_oracle_client = Arc::new(MockPriceOracleClientTrait::new());
     let mut provider = L1GasPriceProvider::new(
         L1GasPriceProviderConfig { number_of_blocks_for_mean: 3, ..Default::default() },
         eth_to_strk_oracle_client,
@@ -116,7 +116,7 @@ fn gas_price_provider_timestamp_changes_mean() {
 
 #[test]
 fn gas_price_provider_can_start_at_nonzero_height() {
-    let eth_to_strk_oracle_client = Arc::new(MockEthToStrkOracleClientTrait::new());
+    let eth_to_strk_oracle_client = Arc::new(MockPriceOracleClientTrait::new());
     let mut provider = L1GasPriceProvider::new(
         L1GasPriceProviderConfig { number_of_blocks_for_mean: 3, ..Default::default() },
         eth_to_strk_oracle_client,
@@ -129,7 +129,7 @@ fn gas_price_provider_can_start_at_nonzero_height() {
 
 #[test]
 fn gas_price_provider_uninitialized_error() {
-    let eth_to_strk_oracle_client = Arc::new(MockEthToStrkOracleClientTrait::new());
+    let eth_to_strk_oracle_client = Arc::new(MockPriceOracleClientTrait::new());
     let mut provider = L1GasPriceProvider::new(
         L1GasPriceProviderConfig { number_of_blocks_for_mean: 3, ..Default::default() },
         eth_to_strk_oracle_client,

crates/apollo_l1_gas_price_types/src/lib.rs

@@ -104,7 +104,7 @@ pub trait L1GasPriceProviderClient: Send + Sync {
 
 #[cfg_attr(any(feature = "testing", test), automock)]
 #[async_trait]
-pub trait EthToStrkOracleClientTrait: Send + Sync + Debug {
+pub trait PriceOracleClientTrait: Send + Sync + Debug {
     /// Fetches the eth to fri rate for a given timestamp.
     async fn eth_to_fri_rate(&self, timestamp: u64) -> Result<u128, PriceOracleClientError>;
 }