chore: resolve conflicts

bnb-chain · Nov 7, 2024 · f0f5563 · f0f5563
1 parent 4c79213
commit f0f5563
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
@@ -681,7 +681,7 @@ macro_rules! spec_to_generic {
                 use $crate::PragueSpec as SPEC;
                 $e
             }
-            $crate::SpecId::PRAGUE_EOF => {
+            $crate::SpecId::OSAKA => {
                 use $crate::PragueEofSpec as SPEC;
                 $e
             }
@@ -747,7 +747,7 @@ mod tests {
         #[cfg(not(feature = "bsc"))]
         spec_to_generic!(PRAGUE, assert_eq!(SPEC::SPEC_ID, PRAGUE));
         #[cfg(not(feature = "bsc"))]
-        spec_to_generic!(PRAGUE_EOF, assert_eq!(SPEC::SPEC_ID, PRAGUE_EOF));
+        spec_to_generic!(OSAKA, assert_eq!(SPEC::SPEC_ID, OSAKA));
         #[cfg(any(feature = "bsc", feature = "opbnb"))]
         spec_to_generic!(HABER, assert_eq!(SPEC::SPEC_ID, HABER));
         spec_to_generic!(OSAKA, assert_eq!(SPEC::SPEC_ID, OSAKA));