context -> test_context in Cheatcodes config

Author: zerosnacks

crates/cheatcodes/src/fs.rs

@@ -97,7 +97,7 @@ impl Cheatcode for closeFileCall {
         let Self { path } = self;
         let path = state.config.ensure_path_allowed(path, FsAccessKind::Read)?;
 
-        state.context.opened_read_files.remove(&path);
+        state.test_context.opened_read_files.remove(&path);
 
         Ok(Default::default())
     }
@@ -167,7 +167,7 @@ impl Cheatcode for readLineCall {
         let path = state.config.ensure_path_allowed(path, FsAccessKind::Read)?;
 
         // Get reader for previously opened file to continue reading OR initialize new reader
-        let reader = match state.context.opened_read_files.entry(path.clone()) {
+        let reader = match state.test_context.opened_read_files.entry(path.clone()) {
             Entry::Occupied(entry) => entry.into_mut(),
             Entry::Vacant(entry) => entry.insert(BufReader::new(fs::open(path)?)),
         };
@@ -212,7 +212,7 @@ impl Cheatcode for removeFileCall {
         state.config.ensure_not_foundry_toml(&path)?;
 
         // also remove from the set if opened previously
-        state.context.opened_read_files.remove(&path);
+        state.test_context.opened_read_files.remove(&path);
 
         if state.fs_commit {
             fs::remove_file(&path)?;

crates/cheatcodes/src/inspector.rs

@@ -89,7 +89,6 @@ pub trait CheatcodesExecutor {
     /// [revm::Inspector].
     fn get_inspector<'a>(&'a mut self, cheats: &'a mut Cheatcodes) -> Box<dyn InspectorExt + 'a>;
 
-    /// Obtains [revm::Evm] instance and executes the given CREATE frame.
     /// Obtains [revm::Evm] instance and executes the given CREATE frame.
     fn exec_create(
         &mut self,
@@ -222,19 +221,19 @@ macro_rules! try_or_return {
 
 /// Contains additional, test specific resources that should be kept for the duration of the test
 #[derive(Debug, Default)]
-pub struct Context {
+pub struct TestContext {
     /// Buffered readers for files opened for reading (path => BufReader mapping)
     pub opened_read_files: HashMap<PathBuf, BufReader<File>>,
 }
 
 /// Every time we clone `Context`, we want it to be empty
-impl Clone for Context {
+impl Clone for TestContext {
     fn clone(&self) -> Self {
         Default::default()
     }
 }
 
-impl Context {
+impl TestContext {
     /// Clears the context.
     #[inline]
     pub fn clear(&mut self) {
@@ -484,7 +483,7 @@ pub struct Cheatcodes {
     pub config: Arc<CheatsConfig>,
 
     /// Test-scoped context holding data that needs to be reset every test run
-    pub context: Context,
+    pub test_context: TestContext,
 
     /// Whether to commit FS changes such as file creations, writes and deletes.
     /// Used to prevent duplicate changes file executing non-committing calls.
@@ -568,7 +567,7 @@ impl Cheatcodes {
             broadcast: Default::default(),
             broadcastable_transactions: Default::default(),
             access_list: Default::default(),
-            context: Default::default(),
+            test_context: Default::default(),
             serialized_jsons: Default::default(),
             eth_deals: Default::default(),
             gas_metering: Default::default(),

crates/cheatcodes/src/lib.rs

@@ -17,7 +17,6 @@ extern crate tracing;
 
 use alloy_primitives::Address;
 use foundry_evm_core::{backend::DatabaseExt, evm::FoundryEvmContext};
-
 use spec::Status;
 
 pub use config::CheatsConfig;