Extend BeefyKeystore to non-supported types

Author: Klapeyron

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

@@ -111,7 +111,25 @@ impl<AuthorityId: AuthorityIdBound> BeefyKeystore<AuthorityId> {
 				sig_ref.to_vec()
 			},
 
-			_ => Err(error::Error::Keystore("key type is not supported by BEEFY Keystore".into()))?,
+			_ => {
+				match store.sign_with(
+					<AuthorityId as AppCrypto>::ID,
+					<AuthorityId as AppCrypto>::CRYPTO_ID,
+					public.as_slice(),
+					&message,
+				) {
+					Ok(sig) => {
+						sig.ok_or_else(|| error::Error::Signature("signature failed".to_string()))?
+					},
+					Err(err) => {
+						warn!(target: LOG_TARGET, "🥩 Error signing commitment: {:?}", err);
+						return Err(error::Error::Signature(format!(
+							"Error signing commitment: {:?}",
+							err
+						)));
+					},
+				}
+			},
 		};
 
 		//check that `sig` has the expected result type
@@ -133,32 +151,15 @@ impl<AuthorityId: AuthorityIdBound> BeefyKeystore<AuthorityId> {
 	pub fn public_keys(&self) -> Result<Vec<AuthorityId>, error::Error> {
 		let store = self.0.clone().ok_or_else(|| error::Error::Keystore("no Keystore".into()))?;
 
-		let pk = match <AuthorityId as AppCrypto>::CRYPTO_ID {
-			ecdsa::CRYPTO_ID => store
-				.ecdsa_public_keys(BEEFY_KEY_TYPE)
-				.drain(..)
-				.map(|pk| AuthorityId::try_from(pk.as_ref()))
-				.collect::<Result<Vec<_>, _>>()
-				.or_else(|_| {
-					Err(error::Error::Keystore(
-						"unable to convert public key into authority id".into(),
-					))
-				}),
-
-			#[cfg(feature = "bls-experimental")]
-			ecdsa_bls381::CRYPTO_ID => store
-				.ecdsa_bls381_public_keys(BEEFY_KEY_TYPE)
-				.drain(..)
-				.map(|pk| AuthorityId::try_from(pk.as_ref()))
-				.collect::<Result<Vec<_>, _>>()
-				.or_else(|_| {
-					Err(error::Error::Keystore(
-						"unable to convert public key into authority id".into(),
-					))
-				}),
-
-			_ => Err(error::Error::Keystore("key type is not supported by BEEFY Keystore".into())),
-		};
+		let pk = store
+			.keys(BEEFY_KEY_TYPE)
+			.map_err(|e| error::Error::Keystore(e.to_string()))?
+			.into_iter()
+			.map(|pk| AuthorityId::try_from(pk.as_ref()))
+			.collect::<Result<Vec<_>, _>>()
+			.or_else(|_| {
+				Err(error::Error::Keystore("unable to convert public key into authority id".into()))
+			});
 
 		pk
 	}