From 4b61845b06f4d98df218dacd0416ce736e7b4484 Mon Sep 17 00:00:00 2001 From: j75689 Date: Thu, 7 Nov 2024 09:52:55 +0800 Subject: [PATCH] chore: resolve conflicts --- 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 248c89d5..3553174b 100644 --- a/crates/primitives/src/specification.rs +++ b/crates/primitives/src/specification.rs @@ -681,8 +681,8 @@ macro_rules! spec_to_generic { use $crate::PragueSpec as SPEC; $e } - $crate::SpecId::PRAGUE_EOF => { - use $crate::PragueEofSpec as SPEC; + $crate::SpecId::OSAKA => { + use $crate::OsakaSpec as SPEC; $e } $crate::SpecId::HABER | $crate::SpecId::HABER_FIX | $crate::SpecId::BOHR => { @@ -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));