Remove testlang and refactor tests (#1374)

This PR does ~two~ three things:

1. Add tests to the Solidity packages (cargo and npm) of functionality
that was only tested in `testlang`.
 2. Remove `testlang`.
3. Refactor tests to have a nicer tree-structure related to the topic
being tested.

Author: beta-ziliani

.cspell.json

@@ -32,7 +32,6 @@
     "struct",
     "structs",
     "tera",
-    "testlang",
     "ufixed",
     "unparse",
     "usize"

Cargo.lock

@@ -38,12 +38,6 @@ members = [
     "crates/solidity/testing/snapshots",
     "crates/solidity/testing/solc",
     "crates/solidity/testing/sourcify",
-
-    "crates/testlang/inputs/language",
-    "crates/testlang/outputs/cargo/crate",
-    "crates/testlang/outputs/cargo/tests",
-    "crates/testlang/outputs/cargo/wasm",
-    "crates/testlang/outputs/npm/package",
 ]
 
 [workspace.dependencies]
@@ -82,12 +76,6 @@ solidity_testing_snapshots = { path = "crates/solidity/testing/snapshots", versi
 solidity_testing_solc = { path = "crates/solidity/testing/solc", version = "1.2.1" }
 solidity_testing_sourcify = { path = "crates/solidity/testing/sourcify", version = "1.2.1" }
 
-slang_testlang = { path = "crates/testlang/outputs/cargo/crate", version = "1.2.1" }
-testlang_cargo_tests = { path = "crates/testlang/outputs/cargo/tests", version = "1.2.1" }
-testlang_cargo_wasm = { path = "crates/testlang/outputs/cargo/wasm", version = "1.2.1" }
-testlang_language = { path = "crates/testlang/inputs/language", version = "1.2.1" }
-testlang_npm_package = { path = "crates/testlang/outputs/npm/package", version = "1.2.1" }
-
 #
 # External
 #

Cargo.toml

@@ -15,7 +15,6 @@ codegen_testing = { workspace = true }
 infra_utils = { workspace = true }
 rayon = { workspace = true }
 solidity_language = { workspace = true }
-testlang_language = { workspace = true }
 
 [lints]
 workspace = true

crates/codegen/runner/Cargo.toml

@@ -9,7 +9,6 @@ use infra_utils::cargo::CargoWorkspace;
 use infra_utils::codegen::CodegenFileSystem;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use solidity_language::SolidityDefinition;
-use testlang_language::TestlangDefinition;
 
 use crate::passes::generate_passes;
 
@@ -63,30 +62,6 @@ fn main() {
                 "solidity_npm_package",
             )
         },
-        || {
-            generate_product(
-                &mut CodegenFileSystem::default(),
-                &TestlangDefinition::create(),
-                "codegen_runtime_cargo_crate",
-                "slang_testlang",
-            )
-        },
-        || {
-            generate_product(
-                &mut CodegenFileSystem::default(),
-                &TestlangDefinition::create(),
-                "codegen_runtime_cargo_wasm",
-                "testlang_cargo_wasm",
-            )
-        },
-        || {
-            generate_product(
-                &mut CodegenFileSystem::default(),
-                &TestlangDefinition::create(),
-                "codegen_runtime_npm_package",
-                "testlang_npm_package",
-            )
-        },
     ]
     .par_iter()
     .for_each(|op| op().unwrap());
@@ -105,16 +80,16 @@ fn generate_solidity_tests() -> Result<()> {
     let snapshots_crate = CargoWorkspace::locate_source_crate("solidity_testing_snapshots")?;
     let tests_crate = CargoWorkspace::locate_source_crate("solidity_cargo_tests")?;
 
-    lang_def.generate_version_breaks(&tests_crate.join("src/generated"))?;
+    lang_def.generate_version_breaks(&tests_crate.join("src/cst/generated"))?;
 
     lang_def.generate_bindings_output_tests(
         &snapshots_crate.join("bindings_output"),
-        &tests_crate.join("src/bindings_output/generated"),
+        &tests_crate.join("src/bindings/bindings_output/generated"),
     )?;
 
     lang_def.generate_cst_output_tests(
         &snapshots_crate.join("cst_output"),
-        &tests_crate.join("src/cst_output/generated"),
+        &tests_crate.join("src/cst/cst_output/generated"),
     )?;
 
     lang_def.generate_binder_tests(

crates/codegen/runner/src/main.rs

@@ -15,7 +15,7 @@ pub fn generate_bindings_output_tests(data_dir: &Path, output_dir: &Path) -> Res
 
     for (group_name, test_names) in &tests {
         generate_unit_test_file(
-            "crate::bindings_output::runner",
+            "crate::bindings::bindings_output::runner",
             &mut fs,
             group_name,
             test_names,

crates/codegen/testing/src/bindings_output.rs

@@ -15,7 +15,7 @@ pub fn generate_cst_output_tests(data_dir: &Path, output_dir: &Path) -> Result<(
 
     for (parser_name, test_names) in &parser_tests {
         generate_unit_test_file(
-            "crate::cst_output::runner",
+            "crate::cst::cst_output::runner",
             &mut fs,
             parser_name,
             test_names,

crates/codegen/testing/src/cst_output.rs

@@ -14,7 +14,6 @@ pub const WASM_TARGET: &str = "wasm32-wasip1";
 pub enum WasmPackage {
     Codegen,
     Solidity,
-    Testlang,
 }
 
 impl WasmPackage {
@@ -182,22 +181,20 @@ impl WasmPackage {
         match self {
             Self::Codegen => "codegen_runtime_cargo_wasm",
             Self::Solidity => "solidity_cargo_wasm",
-            Self::Testlang => "testlang_cargo_wasm",
         }
     }
 
     pub fn npm_crate(self) -> &'static str {
         match self {
             Self::Codegen => "codegen_runtime_npm_package",
             Self::Solidity => "solidity_npm_package",
-            Self::Testlang => "testlang_npm_package",
         }
     }
 
     fn runtime_dir(self) -> &'static str {
         match self {
             Self::Codegen => "src/runtime",
-            Self::Solidity | Self::Testlang => "src/generated",
+            Self::Solidity => "src/generated",
         }
     }
 }

crates/infra/cli/src/toolchains/wasm/mod.rs

@@ -10,9 +10,9 @@ use slang_solidity::backend::passes::p4_resolve_references::Output;
 use slang_solidity::compilation::{CompilationUnit, InternalCompilationBuilder};
 
 use super::renderer::binder_report;
-use crate::generated::VERSION_BREAKS;
-use crate::multi_part_file::{split_multi_file, MultiPart};
-use crate::resolver::TestsPathResolver;
+use crate::bindings::multi_part_file::{split_multi_file, MultiPart};
+use crate::compilation::resolver::TestsPathResolver;
+use crate::cst::generated::VERSION_BREAKS;
 
 pub(crate) fn run(group_name: &str, test_name: &str) -> Result<()> {
     let test_dir = CargoWorkspace::locate_source_crate("solidity_testing_snapshots")?

crates/solidity/outputs/cargo/tests/src/binder/runner.rs

@@ -6,7 +6,7 @@ use slang_solidity::bindings::{self, BindingGraph};
 use slang_solidity::cst::{Cursor, Query, TerminalKind};
 use slang_solidity::parser::Parser;
 
-use crate::resolver::TestsPathResolver;
+use crate::compilation::resolver::TestsPathResolver;
 
 const TEST_VERSION: Version = Version::new(0, 8, 26);