Fix CI

cmichi · cmichi · commit 43214d37040a · 2025-11-10T18:07:03.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Implement `bn128` precompiles ‒ [2708](https://github.com/use-ink/ink/pull/2718)
 
 ### Changed
-- Change `selector_bytes!` + `selector_id!` macro to accept `Abi` argument ‒ [2721](https://github.com/use-ink/ink/pull/2721)
+- Change `selector_bytes!` macro to accept `Abi` argument ‒ [2721](https://github.com/use-ink/ink/pull/2721)
 - Refactor contract ref generation and add automatic re-exporting ‒ [#2710](https://github.com/use-ink/ink/pull/2710)
 - Implement and stabilize `terminate_contract` ‒ [2708](https://github.com/use-ink/ink/pull/2708)
 
diff --git a/crates/ink/macro/src/lib.rs b/crates/ink/macro/src/lib.rs
@@ -79,12 +79,7 @@ pub fn blake2x256(input: TokenStream) -> TokenStream {
 ///
 /// ```
 /// # use ink_macro::selector_id;
-/// # use ink_primitives::abi::Abi;
-/// // ink! ABI (BLAKE-2)
-/// assert_eq!(selector_id!(Abi::Ink, "hello"), 843960066,);
-///
-/// // Solidity ABI (Keccak-256)
-/// assert_eq!(selector_id!(Abi::Sol, "hello"), 0x19cb10b7,);
+/// assert_eq!(selector_id!("hello"), 843960066,);
 /// ```
 #[proc_macro]
 pub fn selector_id(input: TokenStream) -> TokenStream {
diff --git a/crates/ink/tests/ui/abi/all/pass/message-name-override.rs b/crates/ink/tests/ui/abi/all/pass/message-name-override.rs
@@ -27,7 +27,7 @@ unsafe extern "Rust" {
 fn main() {
     // Message selector and selector id both use the name override.
     // `blake2b("myMessage")` == `0x6fdbfc04`
-    const MESSAGE_ID: u32 = ::ink::selector_id!(Abi::Ink, "myMessage");
+    const MESSAGE_ID: u32 = ::ink::selector_id!("myMessage");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<MESSAGE_ID>>::SELECTOR,
         [0x6f, 0xdb, 0xfc, 0x04],
diff --git a/crates/ink/tests/ui/abi/all/pass/message-selector-encoding.rs b/crates/ink/tests/ui/abi/all/pass/message-selector-encoding.rs
@@ -51,7 +51,7 @@ mod contract {
 
 fn main() {
     // ink! `message_0` trait definition
-    const TRAIT_ID: u32 = ::ink::selector_id!(Abi::Ink, "Messages::message_0");
+    const TRAIT_ID: u32 = ::ink::selector_id!("Messages::message_0");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<TRAIT_ID>>::SELECTOR,
         [0xFB, 0xAB, 0x03, 0xCE],
@@ -85,7 +85,7 @@ fn main() {
     );
 
     // ink! `message_3` inherent
-    const INHERENT_ID: u32 = ::ink::selector_id!(Abi::Ink, "message_3");
+    const INHERENT_ID: u32 = ::ink::selector_id!("message_3");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<INHERENT_ID>>::SELECTOR,
         [0xB6, 0xC3, 0x27, 0x49],
diff --git a/crates/ink/tests/ui/abi/all/pass/trait-def-message-name-override.rs b/crates/ink/tests/ui/abi/all/pass/trait-def-message-name-override.rs
@@ -27,7 +27,7 @@ fn main() {
     }
 
     // ink! selector
-    assert_selector_eq!(selector_id!(Abi::Ink, "myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));
+    assert_selector_eq!(selector_id!("myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));
 
     // `keccak256("myMessage()")` == `0x1b008a9f`
     assert_selector_eq!(0x1b008a9f_u32, [0x1b, 0x00, 0x8a, 0x9f]);
diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs
@@ -25,7 +25,7 @@ unsafe extern "Rust" {
 fn main() {
     // Constructor selector and selector id both use the name override.
     // `blake2b("myConstructor")` == `0xca295c67`
-    const CTOR_ID: u32 = ::ink::selector_id!(Abi::Ink, "myConstructor");
+    const CTOR_ID: u32 = ::ink::selector_id!("myConstructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<CTOR_ID>>::SELECTOR.unwrap(),
         [0xca, 0x29, 0x5c, 0x67],
diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-alias.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-alias.rs
@@ -28,7 +28,7 @@ fn main() {
     use contract::Contract;
     use std::any::TypeId;
 
-    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
+    const ID: u32 = ::ink::selector_id!("constructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
         true
diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-err.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-err.rs
@@ -26,7 +26,7 @@ fn main() {
     use contract::Contract;
     use std::any::TypeId;
 
-    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
+    const ID: u32 = ::ink::selector_id!("constructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
         true
diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-explicit.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-return-result-explicit.rs
@@ -26,7 +26,7 @@ fn main() {
     use contract::Contract;
     use std::any::TypeId;
 
-    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
+    const ID: u32 = ::ink::selector_id!("constructor");
 
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-selector.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-selector.rs
@@ -30,7 +30,7 @@ mod contract {
 }
 
 fn main() {
-    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor_0");
+    const ID: u32 = ::ink::selector_id!("constructor_0");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::SELECTOR.unwrap(),
         selector_bytes!(Abi::Ink, "constructor_0")
diff --git a/crates/ink/tests/ui/contract/pass/message/message-name-override.rs b/crates/ink/tests/ui/contract/pass/message/message-name-override.rs
@@ -25,7 +25,7 @@ unsafe extern "Rust" {
 fn main() {
     // Message selector and selector id both use the name override.
     // `blake2b("myMessage")` == `0x6fdbfc04`
-    const MESSAGE_ID: u32 = ::ink::selector_id!(Abi::Ink, "myMessage");
+    const MESSAGE_ID: u32 = ::ink::selector_id!("myMessage");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<MESSAGE_ID>>::SELECTOR,
         [0x6f, 0xdb, 0xfc, 0x04],
diff --git a/crates/ink/tests/ui/contract/pass/message/message-selector.rs b/crates/ink/tests/ui/contract/pass/message/message-selector.rs
@@ -50,7 +50,7 @@ mod contract {
 }
 
 fn main() {
-    const TRAIT_ID: u32 = ::ink::selector_id!(Abi::Ink, "Messages::message_0");
+    const TRAIT_ID: u32 = ::ink::selector_id!("Messages::message_0");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<TRAIT_ID>>::SELECTOR,
         [0xFB, 0xAB, 0x03, 0xCE],
@@ -63,7 +63,7 @@ fn main() {
         <Contract as ::ink::reflect::DispatchableMessageInfo<0xC0DE_CAFE_u32>>::SELECTOR,
         0xC0DE_CAFE_u32.to_be_bytes(),
     );
-    const INHERENT_ID: u32 = ::ink::selector_id!(Abi::Ink, "message_3");
+    const INHERENT_ID: u32 = ::ink::selector_id!("message_3");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<INHERENT_ID>>::SELECTOR,
         [0xB6, 0xC3, 0x27, 0x49],
diff --git a/crates/ink/tests/ui/selector_id/pass/bytestring_input.rs b/crates/ink/tests/ui/selector_id/pass/bytestring_input.rs
@@ -3,7 +3,7 @@ use ink_ir as ir;
 macro_rules! assert_macro_eq {
     ( $input:literal ) => {{
         // We put it into a constant to verify that the computation is constant.
-        const HASH: u32 = ink::selector_id!(Abi::Ink, $input);
+        const HASH: u32 = ink::selector_id!($input);
         assert_eq!(
             HASH,
             ir::Selector::compute($input, ir::SelectorAbi::Ink).into_be_u32(),
diff --git a/crates/ink/tests/ui/selector_id/pass/no_implicit_prelude.rs b/crates/ink/tests/ui/selector_id/pass/no_implicit_prelude.rs
@@ -1,5 +1,5 @@
 #![no_implicit_prelude]
 
-const _: ::core::primitive::u32 = ::ink::selector_id!(Abi::Ink, "test");
+const _: ::core::primitive::u32 = ::ink::selector_id!("test");
 
 fn main() {}
diff --git a/crates/ink/tests/ui/selector_id/pass/string_input.rs b/crates/ink/tests/ui/selector_id/pass/string_input.rs
@@ -3,7 +3,7 @@ use ink_ir as ir;
 macro_rules! assert_macro_eq {
     ( $input:literal ) => {{
         // We put it into a constant to verify that the computation is constant.
-        const HASH: u32 = ink::selector_id!(Abi::Ink, $input);
+        const HASH: u32 = ink::selector_id!($input);
         assert_eq!(
             HASH,
             ir::Selector::compute($input.as_bytes(), ir::SelectorAbi::Ink).into_be_u32(),
diff --git a/crates/ink/tests/ui/trait_def/pass/avoid_overlap_with_namespace.rs b/crates/ink/tests/ui/trait_def/pass/avoid_overlap_with_namespace.rs
@@ -31,7 +31,7 @@ fn main() {
         ( $trait_ident:path, $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as $trait_ident>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/ink/tests/ui/trait_def/pass/message-name-override-namespace.rs b/crates/ink/tests/ui/trait_def/pass/message-name-override-namespace.rs
@@ -20,7 +20,7 @@ fn main() {
         ( $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as TraitDefinition>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/ink/tests/ui/trait_def/pass/message-name-override.rs b/crates/ink/tests/ui/trait_def/pass/message-name-override.rs
@@ -20,7 +20,7 @@ fn main() {
         ( $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as TraitDefinition>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/ink/tests/ui/trait_def/pass/message-selector-precedence.rs b/crates/ink/tests/ui/trait_def/pass/message-selector-precedence.rs
@@ -19,7 +19,7 @@ fn main() {
         ( $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as TraitDefinition>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/ink/tests/ui/trait_def/pass/payable_message.rs b/crates/ink/tests/ui/trait_def/pass/payable_message.rs
@@ -12,9 +12,9 @@ pub trait PayableDefinition {
 
 use ink::selector_id;
 
-const PAYABLE_MUT_ID: u32 = selector_id!(Abi::Ink, "payable_mut");
-const UNPAYABLE_ID: u32 = selector_id!(Abi::Ink, "unpayable");
-const UNPAYABLE_MUT_ID: u32 = selector_id!(Abi::Ink, "unpayable_mut");
+const PAYABLE_MUT_ID: u32 = selector_id!("payable_mut");
+const UNPAYABLE_ID: u32 = selector_id!("unpayable");
+const UNPAYABLE_MUT_ID: u32 = selector_id!("unpayable_mut");
 
 fn main() {
     use ink::reflect::{
diff --git a/crates/ink/tests/ui/trait_def/pass/valid_selectors.rs b/crates/ink/tests/ui/trait_def/pass/valid_selectors.rs
@@ -25,7 +25,7 @@ fn main() {
         ( $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as TraitDefinition>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/ink/tests/ui/trait_def/pass/valid_selectors_namespace.rs b/crates/ink/tests/ui/trait_def/pass/valid_selectors_namespace.rs
@@ -25,7 +25,7 @@ fn main() {
         ( $message_id:literal, $expected_selector:expr $(,)? ) => {
             assert_eq!(
                 <<TraitDefinitionRegistry<DefaultEnvironment> as TraitDefinition>::__ink_TraitInfo
-                    as TraitMessageInfo<{selector_id!(Abi::Ink, $message_id)}>>::SELECTOR,
+                    as TraitMessageInfo<{selector_id!($message_id)}>>::SELECTOR,
                     $expected_selector
             );
         }
diff --git a/crates/primitives/src/reflect/dispatch.rs b/crates/primitives/src/reflect/dispatch.rs
@@ -82,7 +82,7 @@ use crate::abi::Abi;
 /// }
 ///
 /// fn main() {
-///     assert_message_info::<(), (), { selector_id!(Abi::Ink, "message1") }>(
+///     assert_message_info::<(), (), { selector_id!("message1") }>(
 ///         false,
 ///         false,
 ///         selector_bytes!(Abi::Ink, "message1"),
@@ -195,7 +195,7 @@ pub trait DispatchableMessageInfo<const ID: u32> {
 /// }
 ///
 /// fn main() {
-///     assert_constructor_info::<(), { selector_id!(Abi::Ink, "constructor1") }>(
+///     assert_constructor_info::<(), { selector_id!("constructor1") }>(
 ///         selector_bytes!(Abi::Ink, "constructor1"),
 ///         "constructor1",
 ///     );
diff --git a/crates/primitives/src/reflect/trait_def/info.rs b/crates/primitives/src/reflect/trait_def/info.rs
@@ -90,32 +90,32 @@
 /// fn main() {
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message_1")}>>::PAYABLE,
+///             as TraitMessageInfo<{selector_id!("trait_message_1")}>>::PAYABLE,
 ///         false,
 ///     );
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message_2")}>>::PAYABLE,
+///             as TraitMessageInfo<{selector_id!("trait_message_2")}>>::PAYABLE,
 ///         true,
 ///     );
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait2>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message")}>>::PAYABLE,
+///             as TraitMessageInfo<{selector_id!("trait_message")}>>::PAYABLE,
 ///         false,
 ///     );
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message_1")}>>::SELECTOR,
+///             as TraitMessageInfo<{selector_id!("trait_message_1")}>>::SELECTOR,
 ///         selector_bytes!(Abi::Ink, "InkTrait::trait_message_1")
 ///     );
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message_2")}>>::SELECTOR,
+///             as TraitMessageInfo<{selector_id!("trait_message_2")}>>::SELECTOR,
 ///         [0xC0, 0xDE, 0xCA, 0xFE]
 ///     );
 ///     assert_eq!(
 ///         <<TraitDefinitionRegistry<DefaultEnvironment> as InkTrait2>::__ink_TraitInfo
-///             as TraitMessageInfo<{selector_id!(Abi::Ink, "trait_message")}>>::SELECTOR,
+///             as TraitMessageInfo<{selector_id!("trait_message")}>>::SELECTOR,
 ///         selector_bytes!(Abi::Ink, "foo::InkTrait2::trait_message")
 ///     );
 /// }
diff --git a/integration-tests/internal/lang-err/constructors-return-value/lib.rs b/integration-tests/internal/lang-err/constructors-return-value/lib.rs
@@ -78,7 +78,7 @@ pub mod constructors_return_value {
         #[test]
         #[allow(clippy::assertions_on_constants)]
         fn infallible_constructor_reflection() {
-            const ID: u32 = ::ink::selector_id!(Abi::Ink, "new");
+            const ID: u32 = ::ink::selector_id!("new");
 
             assert!(
                 !<Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
@@ -94,7 +94,7 @@ pub mod constructors_return_value {
         #[test]
         #[allow(clippy::assertions_on_constants)]
         fn fallible_constructor_reflection() {
-            const ID: u32 = ::ink::selector_id!(Abi::Ink, "try_new");
+            const ID: u32 = ::ink::selector_id!("try_new");
 
             assert!(
                 <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ fn main() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// ink! selector`
`30`		`- assert_selector_eq!(selector_id!(Abi::Ink, "myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));`
	`30`	`+ assert_selector_eq!(selector_id!("myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));`
`31`	`31`
`32`	`32`	// `keccak256("myMessage()")` == `0x1b008a9f`
`33`	`33`	`assert_selector_eq!(0x1b008a9f_u32, [0x1b, 0x00, 0x8a, 0x9f]);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ mod contract {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`fn main() {`
`33`		`- const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor_0");`
	`33`	`+ const ID: u32 = ::ink::selector_id!("constructor_0");`
`34`	`34`	`assert_eq!(`
`35`	`35`	`<Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::SELECTOR.unwrap(),`
`36`	`36`	`selector_bytes!(Abi::Ink, "constructor_0")`