Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
remove rust feature wasm and just keep notwasm
Browse files Browse the repository at this point in the history
  • Loading branch information
zemse committed Jan 16, 2024
1 parent 21f3925 commit a0ba298
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
1 change: 0 additions & 1 deletion bus-mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ mock = { path = "../mock" }

[features]
default = ["notwasm"]
wasm = []
notwasm = ["revm-precompile"]
test = ["mock"]
9 changes: 2 additions & 7 deletions bus-mapping/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion zkevm-circuits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
9 changes: 2 additions & 7 deletions zkevm-circuits/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a0ba298

Please sign in to comment.