Merge remote-tracking branch 'upstream/master' into remove-old-decl-m…

…acros

client/service/test/src/client/mod.rs

@@ -1664,7 +1664,7 @@ fn storage_keys_iter_works() {
 		.storage_keys_iter(&BlockId::Number(0), Some(&prefix), None)
 		.unwrap()
 		.take(9)
-		.map(|x| hex::encode(&x.0))
+		.map(|x| array_bytes::bytes2hex("", &x.0))
 		.collect();
 	assert_eq!(
 		res,
@@ -1708,9 +1708,9 @@ fn storage_keys_iter_works() {
 		.storage_keys_iter(
 			&BlockId::Number(0),
 			Some(&prefix),
-			Some(&StorageKey(
-				hex!("7d5007603a7f5dd729d51d93cf695d6465789443bb967c0d1fe270e388c96eaa").to_vec(),
-			)),
+			Some(&StorageKey(array_bytes::hex2bytes_unchecked(
+				"7d5007603a7f5dd729d51d93cf695d6465789443bb967c0d1fe270e388c96eaa",
+			))),
 		)
 		.unwrap()
 		.take(5)