chore: fix code conflicts

bnb-chain · Jun 3, 2024 · 66b51f9 · 66b51f9
1 parent 5e6116e
commit 66b51f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/crates/precompile/Cargo.toml b/crates/precompile/Cargo.toml
@@ -110,14 +110,6 @@ negate-opbnb-default-handler = [
 ]
 # Enables the BLS12-381 precompiles.
 blst = ["dep:blst"]
-opbnb = ["revm-primitives/opbnb"]
-opbnb-default-handler = [
-    "opbnb",
-    "revm-primitives/opbnb-default-handler",
-]
-negate-opbnb-default-handler = [
-    "revm-primitives/negate-opbnb-default-handler",
-]
 
 [[bench]]
 name = "bench"

diff --git a/crates/precompile/src/lib.rs b/crates/precompile/src/lib.rs
@@ -9,10 +9,11 @@
 extern crate alloc as std;
 
 pub mod blake2;
-mod bls;
 #[cfg(feature = "blst")]
 pub mod bls12_381;
+#[cfg(feature = "opbnb")]
 pub mod bls;
+#[cfg(feature = "opbnb")]
 pub mod cometbft;
 pub mod bn128;
 pub mod hash;

diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
@@ -222,8 +222,6 @@ spec!(REGOLITH, RegolithSpec);
 spec!(CANYON, CanyonSpec);
 #[cfg(feature = "optimism")]
 spec!(ECOTONE, EcotoneSpec);
-#[cfg(feature = "opbnb")]
-spec!(FERMAT, FermatSpec);
 #[cfg(feature = "optimism")]
 spec!(FJORD, FjordSpec);
 #[cfg(feature = "opbnb")]