keyring: remove lazy_static public keys hash maps

substrate/primitives/core/src/const_hex2array.rs

@@ -18,7 +18,19 @@
 //! Provides a const function for converting a hex string to a `u8` array at compile time, when used
 //! in the proper context.
 
-/// Util that generates array from (static) string literal.
+/// Provides a const array from given string literal.
+///
+/// Valid characters are `[0-9a-fA-F]`, and the hex string should not start
+/// with the `0x` prefix.
+#[macro_export]
+macro_rules! hex2arr {
+	($input:expr) => {{
+		const PUBLIC_BYTES: [u8; $input.len() >> 1] = $crate::const_hex2array::hex2array($input);
+		PUBLIC_BYTES
+	}};
+}
+
+/// Generates array from (static) string literal.
 ///
 /// Valid characters are `[0-9a-fA-F]`, and the hex string should not start
 /// with the `0x` prefix.
@@ -31,6 +43,7 @@
 ///
 /// The function will panic at runtime when used in a non-const context if the above conditions are
 /// met.
+#[doc(hidden)]
 pub const fn hex2array<const N: usize>(hex: &str) -> [u8; N] {
 	const fn c2b(c: u8) -> u8 {
 		match c as char {
@@ -104,6 +117,16 @@ mod testh2b {
 		assert_eq!(T1, [69, 69]);
 	}
 
+	#[test]
+	fn t02m() {
+		assert_eq!(hex2arr!("0a10"), [10, 16]);
+		assert_eq!(hex2arr!("4545"), [69, 69]);
+		assert_eq!(
+			hex2arr!("000102030405060708090a0b0c0d0e0f"),
+			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+		);
+	}
+
 	#[test]
 	fn t16() {
 		const T16: [u8; 16] = hex2array("000102030405060708090a0b0c0d0e0f");

substrate/primitives/keyring/src/bandersnatch.rs

@@ -20,9 +20,8 @@
 pub use sp_core::bandersnatch;
 use sp_core::{
 	bandersnatch::{Pair, Public, Signature},
-	const_hex2array::hex2array as hex2arr,
 	crypto::UncheckedFrom,
-	ByteArray, Pair as PairT,
+	hex2arr, ByteArray, Pair as PairT,
 };
 
 /// Set of test accounts.
@@ -139,13 +138,6 @@ impl From<Keyring> for Pair {
 	}
 }
 
-macro_rules! hex2arr {
-	($input:expr) => {{
-		const PUBLIC_BYTES: [u8; PUBLIC_RAW_LEN] = hex2arr($input);
-		PUBLIC_BYTES
-	}};
-}
-
 impl From<Keyring> for [u8; PUBLIC_RAW_LEN] {
 	fn from(k: Keyring) -> Self {
 		match k {

substrate/primitives/keyring/src/ed25519.rs

@@ -19,9 +19,8 @@
 
 pub use sp_core::ed25519;
 use sp_core::{
-	const_hex2array::hex2array as hex2arr,
 	ed25519::{Pair, Public, Signature},
-	ByteArray, Pair as PairT, H256,
+	hex2arr, ByteArray, Pair as PairT, H256,
 };
 use sp_runtime::AccountId32;
 
@@ -145,20 +144,13 @@ impl From<Keyring> for Pair {
 	}
 }
 
-macro_rules! hex2arr {
-	($input:expr) => {{
-		const PUBLIC_BYTES: [u8; 32] = hex2arr($input);
-		PUBLIC_BYTES
-	}};
-}
-
 impl From<Keyring> for [u8; 32] {
 	fn from(k: Keyring) -> Self {
 		match k {
 			Keyring::Alice =>
 				hex2arr!("88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee"),
 			Keyring::Bob =>
-				hex2arr("d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69"),
+				hex2arr!("d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69"),
 			Keyring::Charlie =>
 				hex2arr!("439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234f"),
 			Keyring::Dave =>

substrate/primitives/keyring/src/sr25519.rs

@@ -19,7 +19,7 @@
 
 pub use sp_core::sr25519;
 use sp_core::{
-	const_hex2array::hex2array as hex2arr,
+	hex2arr,
 	sr25519::{Pair, Public, Signature},
 	ByteArray, Pair as PairT, H256,
 };
@@ -182,13 +182,6 @@ impl From<Keyring> for Pair {
 	}
 }
 
-macro_rules! hex2arr {
-	($input:expr) => {{
-		const PUBLIC_BYTES: [u8; 32] = hex2arr($input);
-		PUBLIC_BYTES
-	}};
-}
-
 impl From<Keyring> for [u8; 32] {
 	fn from(k: Keyring) -> Self {
 		match k {