Move edr_provider's cache_dir to ForkConfig

NomicFoundation · Dec 16, 2024 · 738b120 · 738b120
1 parent f48a18e
commit 738b120
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/edr_generic/tests/issue_570.rs b/crates/edr_generic/tests/issue_570.rs
@@ -25,6 +25,7 @@ fn get_provider() -> anyhow::Result<Provider<GenericChainSpec>> {
         url: get_alchemy_url().replace("eth-mainnet", "base-sepolia"),
         block_number: Some(BLOCK_NUMBER),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
 
     config.chains.insert(

diff --git a/crates/edr_napi/Cargo.toml b/crates/edr_napi/Cargo.toml
@@ -33,6 +33,7 @@ tracing-flame = { version = "0.2.0", default-features = false, features = ["smal
 tracing-subscriber = { version = "0.3.18", default-features = false, features = ["ansi", "env-filter", "fmt", "parking_lot", "smallvec", "std"] }
 parking_lot = { version = "0.12.1", default-features = false }
 lazy_static = { version = "1.4.0", features = [] }
+edr_defaults = { version = "0.3.5", path = "../edr_defaults" }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 openssl-sys = { version = "0.9.93", features = ["vendored"] }

diff --git a/crates/edr_napi/src/config.rs b/crates/edr_napi/src/config.rs
@@ -1,8 +1,10 @@
 use std::{
     num::NonZeroU64,
+    path::PathBuf,
     time::{Duration, SystemTime},
 };
 
+use edr_defaults;
 use edr_eth::HashMap;
 use edr_provider::AccountConfig;
 use napi::{
@@ -142,6 +144,9 @@ impl TryFrom<ForkConfig> for edr_provider::hardhat_rpc_types::ForkConfig {
             url: value.url,
             block_number,
             http_headers,
+            cache_dir: value
+                .cache_dir
+                .map_or(edr_defaults::CACHE_DIR.into(), PathBuf::from),
         })
     }
 }

diff --git a/crates/edr_napi_core/src/provider/config.rs b/crates/edr_napi_core/src/provider/config.rs
@@ -1,5 +1,5 @@
 use core::num::NonZeroU64;
-use std::{path::PathBuf, time::SystemTime};
+use std::time::SystemTime;
 
 use edr_eth::{account::AccountInfo, block::BlobGas, Address, ChainId, HashMap, B256, U256};
 use edr_provider::{
@@ -52,12 +52,6 @@ where
     ChainSpecT: RuntimeSpec<Hardfork: for<'s> From<&'s str>>,
 {
     fn from(value: Config) -> Self {
-        let cache_dir = PathBuf::from(
-            value
-                .cache_dir
-                .unwrap_or(String::from(edr_defaults::CACHE_DIR)),
-        );
-
         let chains = value
             .chains
             .into_iter()
@@ -90,7 +84,6 @@ where
             bail_on_call_failure: value.bail_on_call_failure,
             bail_on_transaction_failure: value.bail_on_transaction_failure,
             block_gas_limit: value.block_gas_limit,
-            cache_dir,
             chain_id: value.chain_id,
             chains,
             coinbase: value.coinbase,

diff --git a/crates/edr_optimism/tests/provider.rs b/crates/edr_optimism/tests/provider.rs
@@ -50,6 +50,7 @@ async fn sepolia_call_with_remote_chain_id() -> anyhow::Result<()> {
         url: sepolia_url(),
         block_number: None,
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
 
     // Set a different chain ID than the forked chain ID

diff --git a/crates/edr_provider/src/config.rs b/crates/edr_provider/src/config.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU64, path::PathBuf, time::SystemTime};
+use std::{num::NonZeroU64, time::SystemTime};
 
 use derive_where::derive_where;
 use edr_eth::{account::AccountInfo, block::BlobGas, Address, ChainId, HashMap, B256, U256};
@@ -85,7 +85,6 @@ pub struct ProviderConfig<ChainSpecT: RuntimeSpec> {
     /// Whether to return an `Err` when a `eth_sendTransaction` fails
     pub bail_on_transaction_failure: bool,
     pub block_gas_limit: NonZeroU64,
-    pub cache_dir: PathBuf,
     pub chain_id: ChainId,
     pub chains: HashMap<ChainId, hardfork::Activations<ChainSpecT>>,
     pub coinbase: Address,

diff --git a/crates/edr_provider/src/data.rs b/crates/edr_provider/src/data.rs
@@ -2640,7 +2640,7 @@ fn create_blockchain_and_state<ChainSpecT: SyncRuntimeSpec<Hardfork: Debug>>(
 
         let rpc_client = Arc::new(EthRpcClient::<ChainSpecT>::new(
             &fork_config.url,
-            config.cache_dir.clone(),
+            fork_config.cache_dir.clone(),
             http_headers.clone(),
         )?);
 
@@ -3818,10 +3818,11 @@ mod tests {
             let mut fixture = ProviderTestFixture::<L1ChainSpec>::new_local()?;
 
             let fork_config = Some(ForkConfig {
-                json_rpc_url: get_alchemy_url(),
+                url: get_alchemy_url(),
                 // Random recent block for better cache consistency
                 block_number: Some(FORK_BLOCK_NUMBER),
                 http_headers: None,
+                cache_dir: edr_defaults::CACHE_DIR.into(),
             });
 
             let block_spec = BlockSpec::Number(FORK_BLOCK_NUMBER);
@@ -3910,9 +3911,10 @@ mod tests {
                 .build()?;
 
             let default_config = create_test_config_with_fork(Some(ForkConfig {
-                json_rpc_url: get_alchemy_url(),
+                url: get_alchemy_url(),
                 block_number: Some(EIP_1559_ACTIVATION_BLOCK),
                 http_headers: None,
+                cache_dir: edr_defaults::CACHE_DIR.into(),
             }));
 
             let config = ProviderConfig {

diff --git a/crates/edr_provider/src/requests/hardhat/rpc_types/config.rs b/crates/edr_provider/src/requests/hardhat/rpc_types/config.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, path::PathBuf};
 
 #[derive(Clone, Debug, PartialEq, serde::Deserialize, serde::Serialize)]
 pub struct ResetProviderConfig {
@@ -12,4 +12,5 @@ pub struct ForkConfig {
     pub url: String,
     pub block_number: Option<u64>,
     pub http_headers: Option<HashMap<String, String>>,
+    pub cache_dir: PathBuf,
 }
diff --git a/crates/edr_provider/src/test_utils.rs b/crates/edr_provider/src/test_utils.rs
@@ -81,7 +81,6 @@ pub fn create_test_config_with_fork<ChainSpecT: RuntimeSpec>(
         min_gas_price: U256::ZERO,
         mining: MiningConfig::default(),
         network_id: 123,
-        cache_dir: edr_defaults::CACHE_DIR.into(),
     }
 }
 
@@ -170,6 +169,7 @@ impl<ChainSpecT: Debug + SyncProviderSpec<CurrentTime>> ProviderTestFixture<Chai
                 // Random recent block for better cache consistency
                 block_number: Some(FORK_BLOCK_NUMBER),
                 http_headers: None,
+                cache_dir: edr_defaults::CACHE_DIR.into(),
             }
         });
 

diff --git a/crates/edr_provider/tests/hardhat_request_serialization.rs b/crates/edr_provider/tests/hardhat_request_serialization.rs
@@ -100,6 +100,7 @@ fn serde_hardhat_reset() {
                 url: String::from("http://whatever.com/whatever"),
                 block_number: Some(123456),
                 http_headers: None,
+                cache_dir: edr_defaults::CACHE_DIR.into(),
             }),
         },
     )));

diff --git a/crates/edr_provider/tests/issues/issue_324.rs b/crates/edr_provider/tests/issues/issue_324.rs
@@ -27,9 +27,10 @@ async fn issue_324() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let mut config = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_alchemy_url().replace("mainnet", "sepolia"),
+        url: get_alchemy_url().replace("mainnet", "sepolia"),
         block_number: Some(DEPLOYMENT_BLOCK_NUMBER),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
     config.hardfork = l1::SpecId::CANCUN;
 

diff --git a/crates/edr_provider/tests/issues/issue_356.rs b/crates/edr_provider/tests/issues/issue_356.rs
@@ -28,10 +28,11 @@ async fn issue_356() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let mut config = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_alchemy_url().replace("mainnet", "sepolia"),
+        url: get_alchemy_url().replace("mainnet", "sepolia"),
         // Pre-cancun Sepolia block
         block_number: Some(4243456),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
     config.hardfork = l1::SpecId::CANCUN;
 

diff --git a/crates/edr_provider/tests/issues/issue_384.rs b/crates/edr_provider/tests/issues/issue_384.rs
@@ -14,9 +14,10 @@ async fn avalanche_chain_mine_local_block() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let config = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_infura_url().replace("mainnet", "avalanche-mainnet"),
+        url: get_infura_url().replace("mainnet", "avalanche-mainnet"),
         block_number: Some(BLOCK_NUMBER),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
 
     let provider = Provider::new(

diff --git a/crates/edr_provider/tests/issues/issue_503.rs b/crates/edr_provider/tests/issues/issue_503.rs
@@ -18,9 +18,10 @@ async fn issue_503() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let mut config = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_alchemy_url(),
+        url: get_alchemy_url(),
         block_number: Some(19_909_475),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
     config.hardfork = l1::SpecId::CANCUN;
 

diff --git a/crates/edr_provider/tests/issues/issue_533.rs b/crates/edr_provider/tests/issues/issue_533.rs
@@ -15,9 +15,10 @@ async fn issue_533() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let mut config = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_alchemy_url(),
+        url: get_alchemy_url(),
         block_number: Some(20_384_300),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
 
     // The default chain id set by Hardhat

diff --git a/crates/edr_provider/tests/issues/issue_588.rs b/crates/edr_provider/tests/issues/issue_588.rs
@@ -18,9 +18,10 @@ async fn issue_588() -> anyhow::Result<()> {
     let subscriber = Box::new(|_event| {});
 
     let early_mainnet_fork = create_test_config_with_fork(Some(ForkConfig {
-        json_rpc_url: get_alchemy_url(),
+        url: get_alchemy_url(),
         block_number: Some(2_675_000),
         http_headers: None,
+        cache_dir: edr_defaults::CACHE_DIR.into(),
     }));
 
     let current_time_is_1970 = Arc::new(MockTime::with_seconds(0));