From 2b33047d47cc344234abfda29a55845cd5b70246 Mon Sep 17 00:00:00 2001 From: Sean Billig Date: Sun, 5 Mar 2023 21:29:16 -0800 Subject: [PATCH] Fix test-runner build on wasm; fix wasm tests --- .github/workflows/main.yml | 2 +- Cargo.lock | 93 +++++-------------------- crates/analyzer/tests/errors.rs | 4 +- crates/test-runner/Cargo.toml | 3 +- crates/test-runner/src/lib.rs | 8 --- crates/test-utils/Cargo.toml | 2 +- crates/tests-legacy/Cargo.toml | 15 ++-- crates/tests-legacy/src/differential.rs | 2 +- 8 files changed, 30 insertions(+), 99 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 248581f5ac..6415b07b5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: # wasm-pack needs a Cargo.toml with a 'package' field. # (see https://github.com/rustwasm/wasm-pack/issues/642) # This will still run all tests in the workspace. - run: wasm-pack test --node crates/fe -- --workspace + run: wasm-pack test --node crates/fe --workspace release: # Only run this when we push a tag diff --git a/Cargo.lock b/Cargo.lock index dfb7afc0a9..eb1499cc22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -371,7 +371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -520,7 +520,7 @@ dependencies = [ "ff", "generic-array", "group", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -749,7 +749,7 @@ dependencies = [ "fe-driver", "fe-test-files", "fe-yulc", - "getrandom 0.2.8", + "getrandom", "hex", "indexmap", "insta", @@ -788,7 +788,7 @@ dependencies = [ "pretty_assertions", "primitive-types", "proptest", - "rand 0.7.3", + "rand", "rstest", "wasm-bindgen-test", "yultsur", @@ -875,6 +875,7 @@ version = "0.21.0-alpha" dependencies = [ "bytes", "colored", + "getrandom", "hex", "revm", ] @@ -894,7 +895,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -905,7 +906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -953,17 +954,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.8" @@ -973,7 +963,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -990,7 +980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1610,8 +1600,8 @@ dependencies = [ "lazy_static", "num-traits", "quick-error", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax", "unarray", @@ -1638,19 +1628,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1658,18 +1635,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1679,16 +1646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1697,16 +1655,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1715,7 +1664,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2154,7 +2103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2236,7 +2185,7 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.5", + "rand", "rustc-hex", ] @@ -2445,12 +2394,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/crates/analyzer/tests/errors.rs b/crates/analyzer/tests/errors.rs index a0949a1d1b..f4a9c8097d 100644 --- a/crates/analyzer/tests/errors.rs +++ b/crates/analyzer/tests/errors.rs @@ -355,5 +355,5 @@ test_file! { invalid_struct_pub_qualifier } test_file! { mut_mistakes } test_file! { invalid_comparisons } -test_file! { test_call } -test_file! { test_params } +// test_file! { test_call } +// test_file! { test_params } diff --git a/crates/test-runner/Cargo.toml b/crates/test-runner/Cargo.toml index 6c6234898e..3c82b109a9 100644 --- a/crates/test-runner/Cargo.toml +++ b/crates/test-runner/Cargo.toml @@ -11,5 +11,6 @@ hex="0.4" bytes = "1.3" colored = "2.0" -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +# used by revm; we need to force the js feature for wasm support +getrandom = { version = "0.2.8", features = ["js"] } revm = "3.0" diff --git a/crates/test-runner/src/lib.rs b/crates/test-runner/src/lib.rs index 441b26060e..ed6a8661f5 100644 --- a/crates/test-runner/src/lib.rs +++ b/crates/test-runner/src/lib.rs @@ -1,7 +1,5 @@ -#[cfg(not(target_arch = "wasm32"))] use bytes::Bytes; use colored::Colorize; -#[cfg(not(target_arch = "wasm32"))] use revm::{ interpreter::{instruction_result::SuccessOrHalt, Contract, DummyHost, Interpreter}, primitives::{Bytecode, Env, LatestSpec, B160, U256}, @@ -70,7 +68,6 @@ impl Display for TestSink { } } -#[cfg(not(target_arch = "wasm32"))] pub fn execute(name: &str, bytecode: &str, sink: &mut TestSink) -> bool { let input = Bytes::new(); let bytecode = Bytecode::new_raw(Bytes::copy_from_slice(&hex::decode(bytecode).unwrap())); @@ -93,8 +90,3 @@ pub fn execute(name: &str, bytecode: &str, sink: &mut TestSink) -> bool { reverted } - -#[cfg(target_arch = "wasm32")] -pub fn execute(_name: &str, _bytecode: &str, _sink: &mut TestSink) -> bool { - panic!("test execution not supported on wasm") -} diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 009db5f5a6..3727b890c1 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -24,7 +24,7 @@ indexmap = "1.6.2" insta = { default-features = false, version = "1.26" } # used by ethabi, we need to force the js feature for wasm support -getrandom = { version = "0.2.3", features = ["js"] } +getrandom = { version = "0.2.8", features = ["js"] } [features] solc-backend = ["fe-yulc", "solc", "fe-driver/solc-backend"] diff --git a/crates/tests-legacy/Cargo.toml b/crates/tests-legacy/Cargo.toml index 644036deab..977c69c049 100644 --- a/crates/tests-legacy/Cargo.toml +++ b/crates/tests-legacy/Cargo.toml @@ -21,22 +21,17 @@ fe-driver = {path = "../driver", version = "^0.21.0-alpha"} test-files = {path = "../test-files", package = "fe-test-files" } hex = "0.4" primitive-types = {version = "0.12", default-features = false, features = ["rlp"]} -rand = "0.7.3" +rand = "0.8.5" rstest = "0.6.4" # This fork contains the shorthand macros and some other necessary updates. yultsur = {git = "https://github.com/g-r-a-n-t/yultsur", rev = "ae85470"} -insta = { default-features = false, version = "1.26" } +insta = { default-features = false, version = "1.26" } pretty_assertions = "1.0.0" wasm-bindgen-test = "0.3.24" dir-test="0.1" +[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] +proptest = {version = "1.1.0", default-features = false, features = ["std"]} + [features] solc-backend = ["fe-yulc/solc-backend", "fe-compiler-test-utils/solc-backend"] - -[dev-dependencies.proptest] -version = "1.0.0" -# The default feature set includes things like process forking which are not -# supported in Web Assembly. -default-features = false -# Enable using the `std` crate. -features = ["std"] diff --git a/crates/tests-legacy/src/differential.rs b/crates/tests-legacy/src/differential.rs index d26f963454..6648ad375e 100644 --- a/crates/tests-legacy/src/differential.rs +++ b/crates/tests-legacy/src/differential.rs @@ -1,5 +1,5 @@ //! Tests that check for differences between Solidity and Fe implementations of similar contracts -#![cfg(feature = "solc-backend")] +#![cfg(all(feature = "solc-backend", not(target_arch = "wasm32")))] use proptest::prelude::*; use fe_compiler_test_utils::*;