move test folder and machete

openvm-org · Jan 10, 2025 · 53475d1 · 53475d1
1 parent 7685342
commit 53475d1
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 219 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ members = [
     "extensions/native/recursion",
     "extensions/native/transpiler",
     "extensions/native/guest-macro",
-    "extensions/native/guest-macro/test",
+    "extensions/native/tests",
     "extensions/algebra/circuit",
     "extensions/algebra/transpiler",
     "extensions/algebra/guest",

diff --git a/crates/toolchain/build/src/lib.rs b/crates/toolchain/build/src/lib.rs
@@ -34,7 +34,12 @@ pub fn get_package(manifest_dir: impl AsRef<Path>) -> Package {
         .manifest_path(&manifest_path)
         .no_deps()
         .exec()
-        .expect("cargo metadata command failed");
+        .unwrap_or_else(|e| {
+            panic!(
+                "cargo metadata command failed for manifest path: {}: {e:?}",
+                manifest_path.display()
+            )
+        });
     let mut matching: Vec<Package> = manifest_meta
         .packages
         .into_iter()

diff --git a/extensions/native/circuit/Cargo.toml b/extensions/native/circuit/Cargo.toml
@@ -29,7 +29,6 @@ eyre.workspace = true
 serde.workspace = true
 serde-big-array.workspace = true
 serde_with.workspace = true
-rayon.workspace = true
 
 [dev-dependencies]
 openvm-stark-sdk = { workspace = true }

diff --git a/extensions/native/compiler/Cargo.toml b/extensions/native/compiler/Cargo.toml
@@ -16,25 +16,19 @@ openvm-stark-backend = { workspace = true }
 openvm-native-compiler-derive = { workspace = true }
 openvm-instructions = { workspace = true }
 openvm-instructions-derive = { workspace = true }
-openvm-circuit-primitives = { workspace = true }
 openvm-stark-sdk = { workspace = true }
 openvm-circuit = { workspace = true }
 openvm-rv32im-transpiler = { workspace = true }
 # disable jemalloc to be compatible with stark-backend
 snark-verifier-sdk = { workspace = true, optional = true }
 
-tracing.workspace = true
 itertools.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 backtrace = { workspace = true, features = ["serde"] }
 strum_macros = "0.26.4"
-num-bigint-dig.workspace = true
 num-bigint.workspace = true
 num-integer.workspace = true
-num-traits.workspace = true
 metrics = { workspace = true, optional = true }
-cfg-if = { workspace = true }
 strum = { workspace = true }
 
 [dev-dependencies]

diff --git a/extensions/native/guest-macro/Cargo.toml b/extensions/native/guest-macro/Cargo.toml
@@ -10,15 +10,13 @@ repository.workspace = true
 proc-macro = true
 
 [dependencies]
-syn = { version = "2.0", features = ["parsing"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 openvm-instructions = { workspace = true }
 openvm-native-compiler = { workspace = true }
 openvm-native-transpiler = { workspace = true }
 p3-field = { workspace = true }
 p3-baby-bear = { workspace = true }
-openvm-stark-backend = { workspace = true }
 
 [dev-dependencies]
 strum.workspace = true

diff --git a/extensions/native/guest-macro/test/Cargo.toml b/extensions/native/guest-macro/test/Cargo.toml
diff --git a/extensions/native/guest-macro/test/program/Cargo.toml b/extensions/native/guest-macro/test/program/Cargo.toml
diff --git a/extensions/native/guest-macro/test/src/main.rs b/extensions/native/guest-macro/test/src/main.rs
diff --git a/extensions/native/tests/Cargo.toml b/extensions/native/tests/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "openvm-native-integration-tests"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[dependencies]
+openvm-circuit.workspace = true
+openvm-sdk.workspace = true
+openvm-build.workspace = true
+openvm-transpiler.workspace = true
+openvm-native-transpiler.workspace = true
+openvm-native-circuit.workspace = true
+openvm-rv32im-transpiler.workspace = true
+openvm-toolchain-tests.workspace = true
+p3-baby-bear.workspace = true
+
+eyre.workspace = true
+
+[features]
+default = ["parallel"]
+parallel = ["openvm-circuit/parallel"]
diff --git a/extensions/native/tests/programs/Cargo.toml b/extensions/native/tests/programs/Cargo.toml
@@ -0,0 +1,20 @@
+[workspace]
+[package]
+name = "openvm-native-integration-test-program"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+openvm = { path = "../../../../crates/toolchain/openvm" }
+openvm-native-guest-macro = { path = "../../guest-macro", default-features = false }
+
+[features]
+default = []
+std = ["openvm/std"]
+
+[build-dependencies]
+openvm-native-compiler = { path = "../../compiler", default-features = false }
+openvm-native-transpiler = { path = "../../transpiler", default-features = false }
+openvm-instructions = { path = "../../../../crates/toolchain/instructions", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", rev = "c785515", default-features = false }     # FIXME
+openvm-stark-backend = { git = "https://github.com/openvm-org/stark-backend.git", rev = "c785515", default-features = false }
diff --git a/.../native/guest-macro/test/program/build.rs → extensions/native/tests/programs/build.rs b/.../native/guest-macro/test/program/build.rs → extensions/native/tests/programs/build.rs
diff --git a/...st-macro/test/program/compiler_output.txt → ...native/tests/programs/compiler_output.txt b/...st-macro/test/program/compiler_output.txt → ...native/tests/programs/compiler_output.txt
diff --git a/...tive/guest-macro/test/program/src/main.rs → extensions/native/tests/programs/src/main.rs b/...tive/guest-macro/test/program/src/main.rs → extensions/native/tests/programs/src/main.rs