From f0f5563f8e5b425fd4b0e4be115c45381408157c Mon Sep 17 00:00:00 2001
From: j75689 <j75689@gmail.com>
Date: Thu, 7 Nov 2024 09:52:55 +0800
Subject: [PATCH] chore: resolve conflicts

---
 crates/primitives/src/specification.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
index 248c89d5..ec4c04fa 100644
--- 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));