feat: Add separate index for zk_ee (#11)

evm_tester/src/lib.rs

@@ -78,7 +78,7 @@ impl EvmTester {
     where
         D: EraVMDeployer,
     {
-        let tests = self.all_tests()?;
+        let tests = self.all_tests(Environment::EVMEmulator)?;
         let vm = Arc::new(vm);
 
         let _: Vec<()> = tests
@@ -95,7 +95,7 @@ impl EvmTester {
     /// Runs all tests on ZK OS.
     ///
     pub fn run_zk_os(self, vm: ZkOS) -> anyhow::Result<()> {
-        let tests = self.all_tests()?;
+        let tests = self.all_tests(Environment::ZkOS)?;
         let vm = Arc::new(vm);
 
         let _: Vec<()> = tests
@@ -111,12 +111,13 @@ impl EvmTester {
     ///
     /// Returns all tests from all directories.
     ///
-    fn all_tests(&self) -> anyhow::Result<Vec<Test>> {
+    fn all_tests(&self, environment: Environment) -> anyhow::Result<Vec<Test>> {
         let mut tests = Vec::with_capacity(16384);
 
         tests.extend(self.directory::<EthereumGeneralStateTestsDirectory>(
             Self::GENERAL_STATE_TESTS,
             Self::GENERAL_STATE_TESTS_FILLER,
+            environment,
         )?);
 
         Ok(tests)
@@ -125,12 +126,21 @@ impl EvmTester {
     ///
     /// Returns all tests from the specified directory.
     ///
-    fn directory<T>(&self, path: &str, filler_path: &str) -> anyhow::Result<Vec<Test>>
+    fn directory<T>(
+        &self,
+        path: &str,
+        filler_path: &str,
+        environment: Environment,
+    ) -> anyhow::Result<Vec<Test>>
     where
         T: Collection,
     {
-        T::read_all(Path::new(path), Path::new(filler_path), &self.filters).map_err(|error| {
-            anyhow::anyhow!("Failed to read the tests directory `{path}`: {error}")
-        })
+        T::read_all(
+            Path::new(path),
+            Path::new(filler_path),
+            &self.filters,
+            environment,
+        )
+        .map_err(|error| anyhow::anyhow!("Failed to read the tests directory `{path}`: {error}"))
     }
 }

evm_tester/src/test_suits/ethereum_general_state/mod.rs

@@ -6,24 +6,21 @@ use std::path::Path;
 use std::path::PathBuf;
 
 pub mod index;
+pub mod platforms;
+
+use platforms::index_for_environment;
 
 use crate::filters::Filters;
 use crate::test::Test;
 use crate::test_suits::Collection;
+use crate::Environment;
 
 ///
 /// The Ethereum tests directory.
 ///
 pub struct EthereumGeneralStateTestsDirectory;
 
 impl EthereumGeneralStateTestsDirectory {
-    ///
-    /// The index file path.
-    ///
-    /// Must be appended to the tests directory.
-    ///
-    const INDEX_NAME: &'static str = "ethereum-general-state-tests.yaml";
-
     ///
     /// Reads the Ethereum test index.
     ///
@@ -39,9 +36,9 @@ impl Collection for EthereumGeneralStateTestsDirectory {
         directory_path: &Path,
         filler_path: &Path,
         filters: &Filters,
+        environment: Environment,
     ) -> anyhow::Result<Vec<Test>> {
-        let index_path = PathBuf::from(Self::INDEX_NAME);
-
+        let index_path = PathBuf::from(index_for_environment(environment));
         Ok(Self::read_index(index_path.as_path())?
             .into_enabled_list(directory_path)
             .into_iter()

evm_tester/src/test_suits/ethereum_general_state/platforms/emulator.rs

@@ -0,0 +1,5 @@
+///
+/// The index file path.
+///
+
+pub const INDEX_PATH: &'static str = "indexes/emulator/ethereum-general-state-tests.yaml";

evm_tester/src/test_suits/ethereum_general_state/platforms/mod.rs

@@ -0,0 +1,11 @@
+use crate::Environment;
+
+pub mod emulator;
+pub mod zk_ee;
+
+pub fn index_for_environment(environment: Environment) -> &'static str {
+    match environment {
+        Environment::EVMEmulator => emulator::INDEX_PATH,
+        Environment::ZkOS => zk_ee::INDEX_PATH,
+    }
+}

evm_tester/src/test_suits/ethereum_general_state/platforms/zk_ee.rs

@@ -0,0 +1,5 @@
+///
+/// The index file path.
+///
+
+pub const INDEX_PATH: &'static str = "indexes/zk_ee/ethereum-general-state-tests.yaml";

evm_tester/src/test_suits/mod.rs

@@ -6,6 +6,7 @@ pub mod ethereum_general_state;
 
 use crate::filters::Filters;
 use crate::test::Test;
+use crate::Environment;
 use std::path::Path;
 
 ///
@@ -19,5 +20,6 @@ pub trait Collection {
         directory_path: &Path,
         filler_path: &Path,
         filters: &Filters,
+        environment: Environment,
     ) -> anyhow::Result<Vec<Test>>;
 }