BLS Core Crypto attempt #2

primitives/core/Cargo.toml

@@ -46,7 +46,6 @@ ed25519-zebra = { version = "3.1.0", default-features = false, optional = true }
 blake2 = { version = "0.10.4", default-features = false, optional = true }
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
 bls-like = {git = "https://github.com/w3f/bls", default-features = false}
-hex = { version = "0.4", default-features = false, optional = true}
 libsecp256k1 = { version = "0.7", default-features = false, features = ["static-context"], optional = true }
 merlin = { version = "2.0", default-features = false, optional = true }
 secp256k1 = { version = "0.24.0", default-features = false, features = ["recovery", "alloc"], optional = true }
@@ -113,7 +112,6 @@ std = [
 	"futures/thread-pool",
 	"libsecp256k1/std",
 	"dyn-clonable",
-	"hex",
 ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers

primitives/core/src/bls.rs

@@ -30,8 +30,6 @@ use bls_like::{DoublePublicKey, DoubleSignature, EngineBLS, SerializableToBytes,
 #[cfg(feature = "full_crypto")]
 use bls_like::{DoublePublicKeyScheme, Keypair, Message, SecretKey};
 use codec::{Decode, Encode, MaxEncodedLen};
-#[cfg(feature = "std")]
-use hex;
 use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
@@ -77,12 +75,12 @@ trait BlsBound: EngineBLS + Send + Sync + 'static {}
 
 impl<T: EngineBLS + Send + Sync + 'static> BlsBound for T {}
 
-// Secret key serialized side
+// Secret key serialized size
 #[cfg(feature = "full_crypto")]
 const SECRET_KEY_SERIALIZED_SIZE: usize =
 	<SecretKey<TinyBLS381> as SerializableToBytes>::SERIALIZED_BYTES_SIZE;
 
-// Public key serialized side
+// Public key serialized size
 const PUBLIC_KEY_SERIALIZED_SIZE: usize =
 	<DoublePublicKey<TinyBLS381> as SerializableToBytes>::SERIALIZED_BYTES_SIZE;
 
@@ -326,7 +324,7 @@ impl<T> Serialize for Signature<T> {
 	where
 		S: Serializer,
 	{
-		serializer.serialize_str(&hex::encode(self.inner))
+		serializer.serialize_str(&array_bytes::bytes2hex("", self.as_ref()))
 	}
 }
 
@@ -336,7 +334,7 @@ impl<'de, T> Deserialize<'de> for Signature<T> {
 	where
 		D: Deserializer<'de>,
 	{
-		let signature_hex = hex::decode(&String::deserialize(deserializer)?)
+		let signature_hex = array_bytes::hex2bytes(&String::deserialize(deserializer)?)
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))?;
 		Signature::try_from(signature_hex.as_ref())
 			.map_err(|e| de::Error::custom(format!("{:?}", e)))
@@ -501,7 +499,7 @@ impl<T: BlsBound> CryptoType for Pair<T> {
 	type Pair = Pair<T>;
 }
 
-// Test set excercising the BLS12-377 implementation
+// Test set exercising the BLS12-377 implementation
 #[cfg(test)]
 mod test {
 	use super::*;
@@ -519,7 +517,7 @@ mod test {
 		);
 	}
 
-	//only passes if the seed = seed (mod ScalarField)
+	// Only passes if the seed = (seed mod ScalarField)
 	#[test]
 	fn seed_and_derive_should_work() {
 		let seed = hex!("9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f00");
@@ -534,8 +532,6 @@ mod test {
 		);
 	}
 
-	// TODO FIXME Is this supposed to be successful?
-	// Where is the test vector defined?
 	#[test]
 	fn test_vector_should_work() {
 		let pair = Pair::from_seed(&hex!(
@@ -557,8 +553,6 @@ mod test {
 		assert!(Pair::verify(&signature, &message[..], &public));
 	}
 
-	// TODO FIXME Is this expected to be pass?
-	// Where the test vectors were taken?
 	#[test]
 	fn test_vector_by_string_should_work() {
 		let pair = Pair::from_string(