From 0ebc1e0f5e2ab731bd583c4113440d6226dea58c Mon Sep 17 00:00:00 2001 From: CeciliaZ030 <45245961+CeciliaZ030@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:40:06 +0800 Subject: [PATCH] #[cfg(all(feature = "taiko", not(feature = "optimism")))] --- crates/primitives/src/specification.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs index 68dd7602a5..5bd53cc2f9 100644 --- a/crates/primitives/src/specification.rs +++ b/crates/primitives/src/specification.rs @@ -134,7 +134,7 @@ impl From<&str> for SpecId { "Canyon" => SpecId::CANYON, #[cfg(feature = "optimism")] "Ecotone" => SpecId::ECOTONE, - #[cfg(feature = "taiko")] + #[cfg(all(feature = "taiko", not(feature = "optimism")))] "Katla" => SpecId::KATLA, _ => Self::LATEST, } @@ -277,7 +277,7 @@ macro_rules! spec_to_generic { use $crate::EcotoneSpec as SPEC; $e } - #[cfg(feature = "taiko")] + #[cfg(all(feature = "taiko", not(feature = "optimism")))] $crate::SpecId::KATLA => { use $crate::KatlaSpec as SPEC; $e @@ -414,7 +414,7 @@ mod optimism_tests { } } -#[cfg(feature = "taiko")] +#[cfg(all(feature = "taiko", not(feature = "optimism")))] #[cfg(test)] mod taiko_tests { use super::*;