From ad606bbda8f227727e9c3552e282a04c58c3360f Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 13 Jul 2024 19:58:54 +0200
Subject: [PATCH] chore: rm redundant optimism feature (#9489)

---
 crates/primitives/Cargo.toml                  |  1 -
 crates/storage/codecs/Cargo.toml              |  1 -
 crates/storage/codecs/derive/Cargo.toml       |  3 ---
 crates/storage/codecs/src/alloy/withdrawal.rs | 10 +---------
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
index 1e37184ab..6804ac1e4 100644
--- a/crates/primitives/Cargo.toml
+++ b/crates/primitives/Cargo.toml
@@ -102,7 +102,6 @@ c-kzg = ["dep:c-kzg", "revm-primitives/c-kzg", "dep:tempfile", "alloy-eips/kzg"]
 zstd-codec = ["dep:zstd"]
 optimism = [
     "reth-chainspec/optimism",
-    "reth-codecs/optimism",
     "reth-ethereum-forks/optimism",
     "revm-primitives/optimism",
 ]
diff --git a/crates/storage/codecs/Cargo.toml b/crates/storage/codecs/Cargo.toml
index 43efd45d6..0c69ca543 100644
--- a/crates/storage/codecs/Cargo.toml
+++ b/crates/storage/codecs/Cargo.toml
@@ -49,4 +49,3 @@ alloy = [
     "dep:alloy-genesis",
     "dep:modular-bitfield",
 ]
-optimism = ["reth-codecs-derive/optimism"]
diff --git a/crates/storage/codecs/derive/Cargo.toml b/crates/storage/codecs/derive/Cargo.toml
index 2b7c5311d..f62587faa 100644
--- a/crates/storage/codecs/derive/Cargo.toml
+++ b/crates/storage/codecs/derive/Cargo.toml
@@ -23,6 +23,3 @@ syn.workspace = true
 [dev-dependencies]
 similar-asserts.workspace = true
 syn = { workspace = true, features = ["full", "extra-traits"] }
-
-[features]
-optimism = []
diff --git a/crates/storage/codecs/src/alloy/withdrawal.rs b/crates/storage/codecs/src/alloy/withdrawal.rs
index 3238048ad..0f2569cef 100644
--- a/crates/storage/codecs/src/alloy/withdrawal.rs
+++ b/crates/storage/codecs/src/alloy/withdrawal.rs
@@ -67,14 +67,6 @@ mod tests {
     // expand the flags field and break backwards compatibility
     #[test]
     fn test_ensure_backwards_compatibility() {
-        #[cfg(not(feature = "optimism"))]
-        {
-            assert_eq!(Withdrawal::bitflag_encoded_bytes(), 2);
-        }
-
-        #[cfg(feature = "optimism")]
-        {
-            assert_eq!(Withdrawal::bitflag_encoded_bytes(), 2);
-        }
+        assert_eq!(Withdrawal::bitflag_encoded_bytes(), 2);
     }
 }