Fix selector_id!

Author: cmichi

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!` macro to accept `Abi` argument ‒ [2721](https://github.com/use-ink/ink/pull/2721)
+- Change `selector_bytes!` + `selector_id!` 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)
 

crates/ink/ir/src/ir/selector.rs

@@ -325,7 +325,8 @@ mod tests {
         use quote::quote;
         let sel = SelectorMacro::<crate::marker::SelectorBytes>::try_from(quote! {
             Abi::Sol, "ownCodeHash()"
-        }).unwrap();
+        })
+        .unwrap();
         assert_eq!(sel.selector.bytes, [219u8, 107, 220, 138]);
     }
 
@@ -334,7 +335,8 @@ mod tests {
         use quote::quote;
         let sel = SelectorMacro::<crate::marker::SelectorBytes>::try_from(quote! {
             Abi::Ink, "flip"
-        }).unwrap();
+        })
+        .unwrap();
         assert_eq!(sel.selector.bytes, hex_literal::hex!("633aa551"));
     }
 }

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!("myMessage");
+    const MESSAGE_ID: u32 = ::ink::selector_id!(Abi::Ink, "myMessage");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<MESSAGE_ID>>::SELECTOR,
         [0x6f, 0xdb, 0xfc, 0x04],

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!("Messages::message_0");
+    const TRAIT_ID: u32 = ::ink::selector_id!(Abi::Ink, "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!("message_3");
+    const INHERENT_ID: u32 = ::ink::selector_id!(Abi::Ink, "message_3");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableMessageInfo<INHERENT_ID>>::SELECTOR,
         [0xB6, 0xC3, 0x27, 0x49],

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!("myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));
+    assert_selector_eq!(selector_id!(Abi::Ink, "myMessage"), selector_bytes!(Abi::Ink, "TraitDefinition::myMessage"));
 
     // `keccak256("myMessage()")` == `0x1b008a9f`
     assert_selector_eq!(0x1b008a9f_u32, [0x1b, 0x00, 0x8a, 0x9f]);

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!("myConstructor");
+    const CTOR_ID: u32 = ::ink::selector_id!(Abi::Ink, "myConstructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<CTOR_ID>>::SELECTOR.unwrap(),
         [0xca, 0x29, 0x5c, 0x67],

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!("constructor");
+    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
         true

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!("constructor");
+    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,
         true

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!("constructor");
+    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor");
 
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::IS_RESULT,

crates/ink/tests/ui/contract/pass/constructor/constructor-selector.rs

@@ -30,7 +30,7 @@ mod contract {
 }
 
 fn main() {
-    const ID: u32 = ::ink::selector_id!("constructor_0");
+    const ID: u32 = ::ink::selector_id!(Abi::Ink, "constructor_0");
     assert_eq!(
         <Contract as ::ink::reflect::DispatchableConstructorInfo<ID>>::SELECTOR.unwrap(),
         selector_bytes!(Abi::Ink, "constructor_0")