Make BEEFY client keystore generic over BEEFY AuthorityId type

substrate/client/consensus/beefy/Cargo.toml

@@ -36,6 +36,7 @@ sp-core = { path = "../../../primitives/core" }
 sp-keystore = { path = "../../../primitives/keystore" }
 sp-mmr-primitives = { path = "../../../primitives/merkle-mountain-range" }
 sp-runtime = { path = "../../../primitives/runtime" }
+sp-std = { path = "../../../primitives/std", default-features = false}
 
 [dev-dependencies]
 serde = "1.0.188"
@@ -47,3 +48,12 @@ sp-consensus-grandpa = { path = "../../../primitives/consensus/grandpa" }
 sp-keyring = { path = "../../../primitives/keyring" }
 sp-tracing = { path = "../../../primitives/tracing" }
 substrate-test-runtime-client = { path = "../../../test-utils/runtime/client" }
+
+[features]
+# This feature adds BLS crypto primitives. It should not be used in production since
+# the BLS implementation and interface may still be subject to significant change.
+bls-experimental = [
+	"sp-application-crypto/bls-experimental",
+	"sp-core/bls-experimental",
+	"sp-consensus-beefy/bls-experimental"
+]

substrate/client/consensus/beefy/src/communication/gossip.rs

@@ -481,8 +481,8 @@ pub(crate) mod tests {
 	use sc_network_test::Block;
 	use sp_application_crypto::key_types::BEEFY as BEEFY_KEY_TYPE;
 	use sp_consensus_beefy::{
-		ecdsa_crypto::Signature, known_payloads, Commitment, Keyring, MmrRootHash, Payload,
-		SignedCommitment, VoteMessage,
+		ecdsa_crypto::Signature, known_payloads, Commitment, GenericKeyring, Keyring, MmrRootHash,
+		Payload, SignedCommitment, VoteMessage,
 	};
 	use sp_keystore::{testing::MemoryKeystore, Keystore};
 
@@ -505,8 +505,13 @@ pub(crate) mod tests {
 
 	pub fn sign_commitment<BN: Encode>(who: &Keyring, commitment: &Commitment<BN>) -> Signature {
 		let store = MemoryKeystore::new();
-		store.ecdsa_generate_new(BEEFY_KEY_TYPE, Some(&who.to_seed())).unwrap();
-		let beefy_keystore: BeefyKeystore = Some(store.into()).into();
+		store
+			.ecdsa_generate_new(
+				BEEFY_KEY_TYPE,
+				Some(&<Keyring as GenericKeyring<AuthorityId>>::to_seed(*who)),
+			)
+			.unwrap();
+		let beefy_keystore: BeefyKeystore<AuthorityId> = Some(store.into()).into();
 		beefy_keystore.sign(&who.public(), &commitment.encode()).unwrap()
 	}
 
@@ -534,7 +539,10 @@ pub(crate) mod tests {
 			.validators()
 			.iter()
 			.map(|validator: &AuthorityId| {
-				Some(sign_commitment(&Keyring::from_public(validator).unwrap(), &commitment))
+				Some(sign_commitment(
+					&<Keyring as GenericKeyring<AuthorityId>>::from_public(validator).unwrap(),
+					&commitment,
+				))
 			})
 			.collect();
 

substrate/client/consensus/beefy/src/justification.rs

@@ -76,7 +76,7 @@ pub(crate) fn verify_with_validator_set<Block: BlockT>(
 						.as_ref()
 						.map(|sig| {
 							signatures_checked += 1;
-							BeefyKeystore::verify(id, sig, &message[..])
+							BeefyKeystore::verify(*id, sig, &message[..])
 						})
 						.unwrap_or(false)
 				})
@@ -93,7 +93,8 @@ pub(crate) fn verify_with_validator_set<Block: BlockT>(
 #[cfg(test)]
 pub(crate) mod tests {
 	use sp_consensus_beefy::{
-		known_payloads, Commitment, Keyring, Payload, SignedCommitment, VersionedFinalityProof,
+		known_payloads, Commitment, GenericKeyring, Keyring, Payload, SignedCommitment,
+		VersionedFinalityProof,
 	};
 	use substrate_test_runtime_client::runtime::Block;
 
@@ -111,7 +112,10 @@ pub(crate) mod tests {
 			validator_set_id: validator_set.id(),
 		};
 		let message = commitment.encode();
-		let signatures = keys.iter().map(|key| Some(key.sign(&message))).collect();
+		let signatures = keys
+			.iter()
+			.map(|key| Some(<Keyring as GenericKeyring<AuthorityId>>::sign(*key, &message)))
+			.collect();
 		VersionedFinalityProof::V1(SignedCommitment { commitment, signatures })
 	}
 
@@ -174,7 +178,10 @@ pub(crate) mod tests {
 		};
 		// change a signature to a different key
 		*bad_signed_commitment.signatures.first_mut().unwrap() =
-			Some(Keyring::Dave.sign(&bad_signed_commitment.commitment.encode()));
+			Some(<Keyring as GenericKeyring<AuthorityId>>::sign(
+				Keyring::Dave,
+				&bad_signed_commitment.commitment.encode(),
+			));
 		match verify_with_validator_set::<Block>(block_num, &validator_set, &bad_proof.into()) {
 			Err((ConsensusError::InvalidJustification, 3)) => (),
 			e => assert!(false, "Got unexpected {:?}", e),