Merge pull request #36 from topos-protocol/parse_all_tests

eth_test_parser/src/config.rs

@@ -1,3 +1,5 @@
 pub(crate) const ETH_TESTS_REPO_URL: &str = "https://github.com/ethereum/tests.git";
 pub(crate) const ETH_TESTS_REPO_LOCAL_PATH: &str = "eth_tests";
 pub(crate) const TEST_GROUPS: [&str; 1] = ["GeneralStateTests"];
+// The following subgroups contain subfolders unlike the other test folders.
+pub(crate) const SPECIAL_TEST_SUBGROUPS: [&str; 2] = ["Shanghai", "VMTests"];

eth_test_parser/src/eth_tests_fetching.rs

@@ -1,9 +1,10 @@
 //! Utils to clone and pull the eth test repo.
 
-use std::{path::Path, process::Command};
+use std::{fs, path::Path, process::Command};
 
 use crate::{
-    config::{ETH_TESTS_REPO_LOCAL_PATH, ETH_TESTS_REPO_URL, TEST_GROUPS},
+    config::{ETH_TESTS_REPO_LOCAL_PATH, ETH_TESTS_REPO_URL, SPECIAL_TEST_SUBGROUPS, TEST_GROUPS},
+    fs_scaffolding::get_test_group_dirs,
     utils::run_cmd,
 };
 
@@ -13,6 +14,52 @@ pub(crate) fn clone_or_update_remote_tests() {
     } else {
         download_remote_tests();
     }
+
+    // Flatten special folders before parsing test files
+    flatten_special_folders();
+}
+
+#[allow(clippy::permissions_set_readonly_false)]
+fn flatten_special_folders() {
+    let dirs = get_test_group_dirs()
+        .unwrap()
+        .flat_map(|entry| fs::read_dir(entry.path()).unwrap())
+        .flatten()
+        .filter(|entry| match entry.file_name().to_str() {
+            Some(file_name) => SPECIAL_TEST_SUBGROUPS.contains(&file_name),
+            None => false,
+        });
+
+    dirs.for_each(|d| {
+        let subdirs = fs::read_dir(d.path())
+            .unwrap()
+            .flatten()
+            .filter(|entry| entry.file_type().unwrap().is_dir());
+
+        for sd in subdirs {
+            let new_folder_path = d.path();
+
+            fs::read_dir(sd.path())
+                .unwrap()
+                .flatten()
+                .filter(|entry| match entry.path().extension() {
+                    None => false,
+                    Some(ext) => ext == "json",
+                })
+                .for_each(|f| {
+                    let mut new_path = new_folder_path.clone();
+
+                    // Give write access
+                    let mut permissions = new_path.metadata().unwrap().permissions();
+                    permissions.set_readonly(false);
+                    fs::set_permissions(new_path.clone(), permissions).unwrap();
+
+                    new_path.push(f.file_name().into_string().unwrap().as_str());
+
+                    fs::copy(f.path(), new_path).unwrap();
+                })
+        }
+    });
 }
 
 fn update_remote_tests() {