diff --git a/bus-mapping/Cargo.toml b/bus-mapping/Cargo.toml index 7598077d31..d87f6f6505 100644 --- a/bus-mapping/Cargo.toml +++ b/bus-mapping/Cargo.toml @@ -31,6 +31,5 @@ mock = { path = "../mock" } [features] default = ["notwasm"] -wasm = [] notwasm = ["revm-precompile"] test = ["mock"] diff --git a/bus-mapping/src/lib.rs b/bus-mapping/src/lib.rs index eede35bb62..abd38f9141 100644 --- a/bus-mapping/src/lib.rs +++ b/bus-mapping/src/lib.rs @@ -223,16 +223,11 @@ #![allow(clippy::upper_case_acronyms)] // Too pedantic #![feature(type_changing_struct_update)] -#[cfg(all(target_arch = "wasm32", not(feature = "wasm")))] -compile_error!("bus-mapping: wasm feature must be enabled on wasm arch"); +#[cfg(all(target_arch = "wasm32", feature = "notwasm"))] +compile_error!("bus-mapping: notwasm feature must be disabled when target arch is wasm"); #[cfg(all(not(target_arch = "wasm32"), not(feature = "notwasm")))] compile_error!("bus-mapping: notwasm feature must be enabled when target arch is not wasm"); -#[cfg(all(feature = "wasm", feature = "notwasm"))] -compile_error!("bus-mapping: both wasm & notwasm are enabled, just one of them must be enabled"); -#[cfg(all(not(feature = "wasm"), not(feature = "notwasm")))] -compile_error!("bus-mapping: none of wasm & notwasm are enabled, one of them must be enabled"); - extern crate alloc; extern crate core; diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml index f54071bc6f..c3bb6fe067 100644 --- a/zkevm-circuits/Cargo.toml +++ b/zkevm-circuits/Cargo.toml @@ -54,7 +54,6 @@ pretty_assertions = "1.0.0" [features] default = ["notwasm"] -wasm = ["bus-mapping/wasm"] notwasm = [ "bus-mapping/notwasm", "snark-verifier"] # We export some test circuits for other crates to consume test-circuits = [] diff --git a/zkevm-circuits/src/lib.rs b/zkevm-circuits/src/lib.rs index 2b7da51489..56bf0d4934 100644 --- a/zkevm-circuits/src/lib.rs +++ b/zkevm-circuits/src/lib.rs @@ -17,16 +17,11 @@ #![deny(unsafe_code)] #![deny(clippy::debug_assert_with_mut_call)] -#[cfg(all(target_arch = "wasm32", not(feature = "wasm")))] -compile_error!("bus-mapping: wasm feature must be enabled on wasm arch"); +#[cfg(all(target_arch = "wasm32", feature = "notwasm"))] +compile_error!("bus-mapping: notwasm feature must be disabled when target arch is wasm"); #[cfg(all(not(target_arch = "wasm32"), not(feature = "notwasm")))] compile_error!("bus-mapping: notwasm feature must be enabled when target arch is not wasm"); -#[cfg(all(feature = "wasm", feature = "notwasm"))] -compile_error!("zkevm-circuits: both wasm & notwasm are enabled, just one of them must be enabled"); -#[cfg(all(not(feature = "wasm"), not(feature = "notwasm")))] -compile_error!("zkevm-circuits: none of wasm & notwasm are enabled, one of them must be enabled"); - pub mod bytecode_circuit; #[allow(dead_code, reason = "under active development")] pub mod circuit_tools;