get rid of redundant imports and fix all warnings.

client/beefy/src/aux_schema.rs

@@ -81,11 +81,11 @@ pub(crate) mod tests {
 	use crate::tests::{BeefyTestNet, BeefyAuthIdMaker};
     use sc_network_test::TestNetFactory;
 
-    use crate::keystore::{BeefyKeystore, BeefyECDSAKeystore, BeefyBLSnECDSAKeystore, tests::{SimpleKeyPair}};
+    use crate::keystore::{BeefyKeystore, BeefyECDSAKeystore, BeefyBLSnECDSAKeystore};
 
     use beefy_primitives::{
-	ecdsa_crypto::{AuthorityId, Public as ECDSAPublic, Signature as ECDSASignature, self, Pair as ECDSAKeyPair},
-	bls_crypto::{Public as BLSPublic, Signature as BLSSignature, self},
+	ecdsa_crypto::{Public as ECDSAPublic, Signature as ECDSASignature},
+	bls_crypto::{Public as BLSPublic, Signature as BLSSignature},
     };
 
 

client/beefy/src/communication/request_response/outgoing_requests_engine.rs

@@ -18,9 +18,9 @@
 
 //! Generating request logic for request/response protocol for syncing BEEFY justifications.
 use std::{fmt::Debug, marker::PhantomData};
-use codec::{Codec, Decode, Encode};
+use codec::{Decode, Encode};
 
-use beefy_primitives::{BeefyApi, ValidatorSet};
+use beefy_primitives::{ValidatorSet};
 use futures::channel::{oneshot, oneshot::Canceled};
 use log::{debug, warn};
 use parking_lot::Mutex;
@@ -29,7 +29,6 @@ use sc_network_common::{
 	request_responses::{IfDisconnected, RequestFailure},
 	service::NetworkRequest,
 };
-use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{Block, NumberFor};
 use std::{collections::VecDeque, result::Result, sync::Arc};
 

client/beefy/src/import.rs

@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{fmt::Debug, marker::PhantomData};
-use codec::{Codec, Decode, Encode};
+use codec::{Decode, Encode};
 
 use beefy_primitives::{BeefyApi, BEEFY_ENGINE_ID};
 use log::debug;

client/beefy/src/justification.rs

@@ -81,7 +81,7 @@ fn verify_with_validator_set<Block: BlockT, AuthId: Encode + Decode + Debug + Cl
 #[cfg(test)]
 pub(crate) mod tests {
 	use beefy_primitives::{
-		known_payloads, Commitment, Payload, SignedCommitment, VersionedFinalityProof, ecdsa_crypto::{self, Public as ECDSAPublic, Signature as ECDSASignature, Pair as ECDSAKeyPair},
+		known_payloads, Commitment, Payload, SignedCommitment, VersionedFinalityProof, ecdsa_crypto::{Public as ECDSAPublic, Signature as ECDSASignature, Pair as ECDSAKeyPair},
         bls_crypto::{Public as BLSPublic, Signature as BLSSignature},
 	};
 	use substrate_test_runtime_client::runtime::Block;
@@ -181,7 +181,7 @@ pub(crate) mod tests {
 
     #[test]
     fn should_verify_with_validator_set_with_ecdsa_keys() {        
-        should_verify_with_validator_set::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>();
+        should_verify_with_validator_set::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>();
 	}
 
     #[test]
@@ -214,7 +214,7 @@ pub(crate) mod tests {
 
     #[test]
     fn should_decode_and_verify_finality_proof_with_ecdsa_keys() {        
-        should_decode_and_verify_finality_proof::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>();
+        should_decode_and_verify_finality_proof::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>();
 	}
 
     #[test]

client/beefy/src/keystore.rs

@@ -20,6 +20,7 @@ use sp_application_crypto::RuntimeAppPublic;
 use sp_core::keccak_256;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::traits::Keccak256;
+use sp_application_crypto::Pair;
 
 use log::warn;
 
@@ -35,8 +36,6 @@ use core::fmt::Debug;
 
 use crate::{error, LOG_TARGET};
 
-use sp_core::bls::Pair as BLSPair;
-use sp_application_crypto::Pair as app_crypto_Pair;
 /// A BEEFY specific keystore implemented as a `Newtype`. This is basically a
 /// wrapper around [`sp_keystore::SyncCryptoStore`] and allows to customize
 /// common cryptographic functionality.
@@ -288,8 +287,6 @@ impl BeefyKeystore<(ECDSAPublic,BLSPublic), (ECDSASignature,BLSSignature)> for B
 	}
 
 	fn public_keys(&self) -> Result<Vec<Self::Public>, error::Error> {
-		let store = self.0.clone().ok_or_else(|| error::Error::Keystore("no Keystore".into()))?;
-
 		let bls_n_ecdsa = self.both();
 		let pk  : Vec<Self::Public> = bls_n_ecdsa.0.public_keys()?.into_iter().zip(bls_n_ecdsa.1.public_keys()?.into_iter()).collect();
 
@@ -336,17 +333,15 @@ pub mod tests {
 	use std::sync::Arc;
 
 	use sc_keystore::LocalKeystore;
-	use sp_core::{ecdsa, bls, keccak_256, Pair, crypto::{SecretStringError}};
-        use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr, CryptoStore};
+	use sp_core::{ecdsa, keccak_256, Pair, crypto::{SecretStringError}};
+        use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr,};
         use sp_application_crypto::Wraps;
 
 	use beefy_primitives::{ecdsa_crypto, bls_crypto, KEY_TYPE};
-        use sp_runtime::testing::TestSignature;
 
         use super::{BeefyKeystore, BeefyECDSAKeystore, BeefyBLSnECDSAKeystore, ECDSAPublic, ECDSASignature, BLSPublic, BLSSignature};
         use codec::{Decode, Encode};
         use core::fmt::Debug;
-    	use std::marker::PhantomData;
 
 	use crate::error::Error;
 

client/beefy/src/lib.rs

@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use core::fmt::Debug;
-use codec::{Codec, Decode, Encode};
+use codec::{Decode, Encode};
 
 use crate::{
 	communication::{
@@ -36,7 +36,7 @@ use crate::{
 	worker::PersistedState,
 };
 use beefy_primitives::{
-	ecdsa_crypto::AuthorityId, BeefyApi, MmrRootHash, PayloadProvider, ValidatorSet, BEEFY_ENGINE_ID,
+	BeefyApi, MmrRootHash, PayloadProvider, ValidatorSet, BEEFY_ENGINE_ID,
 	GENESIS_AUTHORITY_SET_ID,
 };
 use futures::{stream::Fuse, StreamExt};
@@ -53,7 +53,6 @@ use sp_blockchain::{
 	Backend as BlockchainBackend, Error as ClientError, HeaderBackend, Result as ClientResult,
 };
 use sp_consensus::{Error as ConsensusError, SyncOracle};
-use sp_keystore::SyncCryptoStorePtr;
 use sp_mmr_primitives::MmrApi;
 use sp_runtime::{
 	generic::BlockId,

client/beefy/src/round.rs

@@ -17,8 +17,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{
-	collections::{BTreeMap, HashMap},
-	hash::Hash, marker::PhantomData,
+	collections::{BTreeMap},
+	hash::Hash, 
 };
 
 use core::fmt::Debug;
@@ -190,13 +190,13 @@ mod tests {
 
 
 	use beefy_primitives::{
-        ecdsa_crypto::{self, Public as ECDSAPublic, Signature as ECDSASignature, Pair as ECDSAKeyPair},
+        ecdsa_crypto::{self, Public as ECDSAPublic, Signature as ECDSASignature,},
         bls_crypto::{Public as BLSPublic, Signature as BLSSignature},
         ValidatorSet};
     use codec::{Decode, Encode};
 
 	use super::{threshold, Block as BlockT, Hash, RoundTracker, Rounds};
-    use crate::{keystore::{ BeefyECDSAKeystore, BeefyBLSnECDSAKeystore, tests::{Keyring, GenericKeyring, SimpleKeyPair, ECDSAnBLSPair}}, tests::BeefyAuthIdMaker,};
+    use crate::{keystore::{ tests::{Keyring, GenericKeyring, SimpleKeyPair, ECDSAnBLSPair}}};
 
 
     impl<P, B, AuthId, TSignature> Rounds<P, B, AuthId, TSignature>

client/beefy/src/tests.rs

@@ -33,12 +33,12 @@ use crate::{
 	PersistedState,
 };
 use beefy_primitives::{
-    ecdsa_crypto::{AuthorityId, Public as ECDSAPublic, Signature as ECDSASignature, self, Pair as ECDSAKeyPair},
-    bls_crypto::{Public as BLSPublic, Signature as BLSSignature, self},
+    ecdsa_crypto::{AuthorityId as ECDSAAuthorityId, Public as ECDSAPublic, Signature as ECDSASignature, Pair as ECDSAKeyPair},
+    bls_crypto::{AuthorityId as BLSAuthorityId, Public as BLSPublic, Signature as BLSSignature},
 	known_payloads,
 	mmr::MmrRootProvider,
 	BeefyApi, Commitment, ConsensusLog, MmrRootHash, Payload, SignedCommitment, ValidatorSet,
-	VersionedFinalityProof, BEEFY_ENGINE_ID, KEY_TYPE as BeefyKeyType,
+	VersionedFinalityProof, BEEFY_ENGINE_ID,
 };
 use futures::{future, stream::FuturesUnordered, Future, StreamExt};
 use parking_lot::Mutex;
@@ -58,7 +58,7 @@ use serde::{Deserialize, Serialize};
 use sp_api::{ApiRef, ProvideRuntimeApi};
 use sp_consensus::BlockOrigin;
 use sp_core::H256;
-use sp_keystore::{testing::KeyStore as TestKeystore, SyncCryptoStore, SyncCryptoStorePtr};
+use sp_keystore::{SyncCryptoStorePtr};
 use sp_mmr_primitives::{EncodableOpaqueLeaf, Error as MmrError, MmrApi, Proof};
 use sp_runtime::{
     codec::{Encode, Decode},
@@ -336,7 +336,7 @@ create_test_api!(
 fn add_mmr_digest(header: &mut Header, mmr_hash: MmrRootHash) {
 	header.digest_mut().push(DigestItem::Consensus(
 		BEEFY_ENGINE_ID,
-		ConsensusLog::<AuthorityId>::MmrRoot(mmr_hash).encode(),
+		ConsensusLog::<ECDSAAuthorityId>::MmrRoot(mmr_hash).encode(),
 	));
 }
 
@@ -354,15 +354,15 @@ pub(crate) trait BeefyAuthIdMaker : Clone + Encode + Decode + Debug + Ord + Sync
      fn make_beefy_ids(keys: &[Keyring]) -> Vec<Self>;
 }
 
-impl BeefyAuthIdMaker for ecdsa_crypto::AuthorityId 
+impl BeefyAuthIdMaker for ECDSAAuthorityId 
 {
      fn make_beefy_ids(keys: &[Keyring]) -> Vec<Self> {
-	     keys.iter().map(|&key| <Keyring as GenericKeyring<ecdsa_crypto::Pair>>::public(key).into()).collect()
+	     keys.iter().map(|&key| <Keyring as GenericKeyring<ECDSAKeyPair>>::public(key).into()).collect()
 
     }
 }
 
-impl BeefyAuthIdMaker for (ecdsa_crypto::AuthorityId, bls_crypto::AuthorityId)
+impl BeefyAuthIdMaker for (ECDSAAuthorityId, BLSAuthorityId)
 {
      fn make_beefy_ids(keys: &[Keyring]) -> Vec<Self> {
 	     keys.iter().map(|&key| <Keyring as GenericKeyring<ECDSAnBLSPair>>::public(key).into()).collect()
@@ -668,7 +668,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId> + 'static,
 
 #[tokio::test]
 async fn beefy_finalizing_blocks_using_ecdsa_signature() {
-    beefy_finalizing_blocks::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    beefy_finalizing_blocks::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -758,12 +758,12 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId> + 'static,
 
 #[tokio::test]
 async fn lagging_validators_with_ecdsa_crypto() {
-    beefy_finalizing_blocks::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    lagging_validators::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
 async fn lagging_validators_with_ecdsa_n_bls_crypto() {
-    beefy_finalizing_blocks::<ECDSAnBLSPair, (ECDSAPublic,BLSPublic), (ECDSASignature,BLSSignature), BeefyBLSnECDSAKeystore>().await;
+    lagging_validators::<ECDSAnBLSPair, (ECDSAPublic,BLSPublic), (ECDSASignature,BLSSignature), BeefyBLSnECDSAKeystore>().await;
 }
 
 async fn correct_beefy_payload<TKeyPair, AuthId, TSignature, TBeefyKeystore>()
@@ -829,7 +829,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId> + 'static,
 
 #[tokio::test]
 async fn correct_beefy_payload_with_ecdsa_signature() {
-    correct_beefy_payload::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    correct_beefy_payload::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -843,7 +843,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
       AuthId: Clone + Encode + Decode + Debug + Ord + Sync + Send + BeefyAuthIdMaker + std::hash::Hash + 'static,
       TSignature:  Encode + Decode + Debug + Clone + Sync + Send + std::cmp::PartialEq  + 'static,
 {
-	use futures::{future::poll_fn, task::Poll};
+	use futures::{future::poll_fn};
 	use sc_block_builder::BlockBuilderProvider;
 	use sc_client_api::BlockBackend;
 
@@ -990,7 +990,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn beefy_importing_blocks_with_ecdsa_signature() {
-    beefy_importing_blocks::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    beefy_importing_blocks::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -1037,7 +1037,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn voter_initialization_with_ecdsa_crypto() {
-    voter_initialization::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    voter_initialization::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -1129,7 +1129,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn on_demand_beefy_justification_sync_with_ecdsa_signature() {
-    on_demand_beefy_justification_sync::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    on_demand_beefy_justification_sync::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -1188,7 +1188,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn should_initialize_voter_at_genesis_with_ecdsa_signature() {
-    should_initialize_voter_at_genesis::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    should_initialize_voter_at_genesis::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -1260,7 +1260,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn should_initialize_voter_when_last_final_is_session_boundary_with_ecdsa_signature() {
-    should_initialize_voter_when_last_final_is_session_boundary::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    should_initialize_voter_when_last_final_is_session_boundary::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]
@@ -1331,7 +1331,7 @@ where TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSig
 
 #[tokio::test]
 async fn should_initialize_voter_at_latest_finalized_with_ecdsa_signature() {
-    should_initialize_voter_at_latest_finalized::<ecdsa_crypto::Pair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
+    should_initialize_voter_at_latest_finalized::<ECDSAKeyPair, ECDSAPublic, ECDSASignature, BeefyECDSAKeystore>().await;
 }
 
 #[tokio::test]