cargo fmt

substrate/primitives/application-crypto/src/lib.rs

@@ -49,9 +49,9 @@ pub mod bandersnatch;
 pub mod bls377;
 #[cfg(feature = "bls-experimental")]
 pub mod bls381;
+pub mod ecdsa;
 #[cfg(feature = "bls-experimental")]
 pub mod ecdsa_bls377;
-pub mod ecdsa;
 pub mod ed25519;
 pub mod sr25519;
 mod traits;

substrate/primitives/consensus/beefy/src/lib.rs

@@ -155,7 +155,7 @@ pub mod bls_crypto {
 pub mod ecdsa_bls_crypto {
 	use super::{BeefyAuthorityId, Hash, RuntimeAppPublic, KEY_TYPE as BEEFY_KEY_TYPE};
 	use sp_application_crypto::{app_crypto, ecdsa_bls377};
-	use sp_core::{ecdsa_bls377::Pair as EcdsaBlsPair, crypto::Wraps, Pair as _};
+	use sp_core::{crypto::Wraps, ecdsa_bls377::Pair as EcdsaBlsPair, Pair as _};
 	app_crypto!(ecdsa_bls377, BEEFY_KEY_TYPE);
 
 	/// Identity of a BEEFY authority using BLS as its crypto.
@@ -325,20 +325,20 @@ where
 	//   have different validator set ids,
 	//   or both votes have the same commitment,
 	//     --> the equivocation is invalid.
-	if first.id != second.id ||
-		first.commitment.block_number != second.commitment.block_number ||
-		first.commitment.validator_set_id != second.commitment.validator_set_id ||
-		first.commitment.payload == second.commitment.payload
+	if first.id != second.id
+		|| first.commitment.block_number != second.commitment.block_number
+		|| first.commitment.validator_set_id != second.commitment.validator_set_id
+		|| first.commitment.payload == second.commitment.payload
 	{
-		return false
+		return false;
 	}
 
 	// check signatures on both votes are valid
 	let valid_first = check_commitment_signature(&first.commitment, &first.id, &first.signature);
 	let valid_second =
 		check_commitment_signature(&second.commitment, &second.id, &second.signature);
 
-	return valid_first && valid_second
+	return valid_first && valid_second;
 }
 
 /// New BEEFY validator set notification hook.
@@ -498,7 +498,7 @@ mod tests {
 		assert!(!BeefyAuthorityId::<Keccak256>::verify(&other_pair.public(), &signature, msg,));
 	}
 
-    #[test]
+	#[test]
 	#[cfg(feature = "bls-experimental")]
 	fn ecdsa_bls_beefy_verify_works() {
 		let msg = &b"test-message"[..];
@@ -513,5 +513,4 @@ mod tests {
 		let (other_pair, _) = ecdsa_bls_crypto::Pair::generate();
 		assert!(!BeefyAuthorityId::<Keccak256>::verify(&other_pair.public(), &signature, msg,));
 	}
-
 }

substrate/primitives/keystore/src/lib.rs

@@ -270,7 +270,7 @@ pub trait Keystore: Send + Sync {
 	#[cfg(feature = "bls-experimental")]
 	fn bls377_public_keys(&self, id: KeyTypeId) -> Vec<bls377::Public>;
 
-    	/// Returns all (ecdsa,bls12-377) paired public keys for the given key type.
+	/// Returns all (ecdsa,bls12-377) paired public keys for the given key type.
 	#[cfg(feature = "bls-experimental")]
 	fn ecdsa_bls377_public_keys(&self, id: KeyTypeId) -> Vec<ecdsa_bls377::Public>;
 
@@ -296,7 +296,6 @@ pub trait Keystore: Send + Sync {
 		seed: Option<&str>,
 	) -> Result<bls377::Public, Error>;
 
-
 	/// Generate a new (ecdsa,bls377) key pair for the given key type and an optional seed.
 	///
 	/// Returns an `ecdsa_bls377::Public` key of the generated key pair or an `Err` if
@@ -340,15 +339,15 @@ pub trait Keystore: Send + Sync {
 		msg: &[u8],
 	) -> Result<Option<bls377::Signature>, Error>;
 
-  	/// Generate a (ecdsa, bls377) signature pair for a given message.
+	/// Generate a (ecdsa, bls377) signature pair for a given message.
 	///
 	/// Receives [`KeyTypeId`] and a [`ecdsa_bls377::Public`] key to be able to map
 	/// them to a private key that exists in the keystore.
 	///
 	/// Returns an [`ecdsa_bls377::Signature`] or `None` in case the given `key_type`
 	/// and `public` combination doesn't exist in the keystore.
 	/// An `Err` will be returned if generating the signature itself failed.
-    #[cfg(feature = "bls-experimental")]
+	#[cfg(feature = "bls-experimental")]
 	fn ecdsa_bls377_sign(
 		&self,
 		key_type: KeyTypeId,
@@ -380,8 +379,8 @@ pub trait Keystore: Send + Sync {
 	/// - ecdsa
 	/// - bandersnatch
 	/// - bls381
-        /// - bls377
-        /// - (ecdsa,bls377) paired keys
+	/// - bls377
+	/// - (ecdsa,bls377) paired keys
 	///
 	/// To support more schemes you can overwrite this method.
 	///
@@ -437,7 +436,7 @@ pub trait Keystore: Send + Sync {
 					.map_err(|_| Error::ValidationError("Invalid public key format".into()))?;
 				self.ecdsa_bls377_sign(id, &public, msg)?.map(|s| s.encode())
 			},
-		    
+
 			_ => return Err(Error::KeyNotSupported(id)),
 		};
 		Ok(signature)
@@ -623,8 +622,7 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).bls377_generate_new(key_type, seed)
 	}
 
-
-    	#[cfg(feature = "bls-experimental")]
+	#[cfg(feature = "bls-experimental")]
 	fn ecdsa_bls377_generate_new(
 		&self,
 		key_type: KeyTypeId,
@@ -633,7 +631,7 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).ecdsa_bls377_generate_new(key_type, seed)
 	}
 
-    #[cfg(feature = "bls-experimental")]
+	#[cfg(feature = "bls-experimental")]
 	fn bls381_sign(
 		&self,
 		key_type: KeyTypeId,
@@ -653,15 +651,15 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		(**self).bls377_sign(key_type, public, msg)
 	}
 
-    	#[cfg(feature = "bls-experimental")]
+	#[cfg(feature = "bls-experimental")]
 	fn ecdsa_bls377_sign(
 		&self,
 		key_type: KeyTypeId,
 		public: &ecdsa_bls377::Public,
 		msg: &[u8],
 	) -> Result<Option<ecdsa_bls377::Signature>, Error> {
 		(**self).ecdsa_bls377_sign(key_type, public, msg)
-    }
+	}
 
 	fn insert(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()> {
 		(**self).insert(key_type, suri, public)

substrate/primitives/keystore/src/testing.rs

@@ -345,7 +345,7 @@ impl Keystore for MemoryKeystore {
 	) -> Result<Option<ecdsa_bls377::Signature>, Error> {
 		self.sign::<ecdsa_bls377::Pair>(key_type, public, msg)
 	}
-    
+
 	fn insert(&self, key_type: KeyTypeId, suri: &str, public: &[u8]) -> Result<(), ()> {
 		self.keys
 			.write()