make beefy client build after merging with master.

client/beefy/src/aux_schema.rs

@@ -20,6 +20,7 @@
 
 use crate::{worker::PersistedState, LOG_TARGET};
 use codec::{Decode, Encode};
+use std::fmt::Debug;
 use log::{info, trace};
 use sc_client_api::{backend::AuxStore, Backend};
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
@@ -36,9 +37,9 @@ pub(crate) fn write_current_version<B: AuxStore>(backend: &B) -> ClientResult<()
 }
 
 /// Write voter state.
-pub(crate) fn write_voter_state<Block: BlockT, B: AuxStore>(
+pub(crate) fn write_voter_state<Block: BlockT, B: AuxStore, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send>(
 	backend: &B,
-	state: &PersistedState<Block>,
+	state: &PersistedState<Block, AuthId, TSignature>,
 ) -> ClientResult<()> {
 	trace!(target: LOG_TARGET, "🥩 persisting {:?}", state);
 	backend.insert_aux(&[(WORKER_STATE, state.encode().as_slice())], &[])
@@ -54,7 +55,7 @@ fn load_decode<B: AuxStore, T: Decode>(backend: &B, key: &[u8]) -> ClientResult<
 }
 
 /// Load or initialize persistent data from backend.
-pub(crate) fn load_persistent<B, BE>(backend: &BE) -> ClientResult<Option<PersistedState<B>>>
+pub(crate) fn load_persistent<B, BE, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send>(backend: &BE) -> ClientResult<Option<PersistedState<B, AuthId, TSignature>>>
 where
 	B: BlockT,
 	BE: Backend<B>,
@@ -63,7 +64,7 @@ where
 
 	match version {
 		None => (),
-		Some(1) => return load_decode::<_, PersistedState<B>>(backend, WORKER_STATE),
+		Some(1) => return load_decode::<_, PersistedState<B, AuthId, TSignature>>(backend, WORKER_STATE),
 		other =>
 			return Err(ClientError::Backend(format!("Unsupported BEEFY DB version: {:?}", other))),
 	}

client/beefy/src/communication/gossip.rs

@@ -101,7 +101,7 @@ pub(crate) struct GossipValidator<B, AuthId, TSignature, BKS>
 where
 	B: Block,
         BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
-	AuthId: Encode + Decode + Debug + Ord + Sync + Send,
+	AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send,
 TSignature: Encode + Decode + Debug + Clone + Sync + Send, 
 {
 	topic: B::Hash,
@@ -117,7 +117,7 @@ impl<B, AuthId, TSignature, BKS> GossipValidator<B, AuthId, TSignature, BKS>
 where
 	B: Block,
 	BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
-	AuthId: Encode + Decode + Debug + Ord + Sync + Send,
+	AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send,
 	TSignature: Encode + Decode + Debug + Clone + Sync + Send, 
 {
 	pub fn new(known_peers: Arc<Mutex<KnownPeers<B>>>) -> GossipValidator<B, AuthId, TSignature, BKS> {
@@ -153,7 +153,7 @@ impl<B, AuthId, TSignature, BKS> Validator<B> for GossipValidator<B, AuthId, TSi
 where
 	B: Block,
         BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
-	AuthId: Encode + Decode + Debug + Ord + Sync + Send,
+	AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send,
 	TSignature: Encode + Decode + Debug + Clone + Sync + Send,
 {
 	fn peer_disconnected(&self, _context: &mut dyn ValidatorContext<B>, who: &PeerId) {

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

@@ -29,6 +29,7 @@ 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};
 
@@ -45,38 +46,36 @@ type Response = Result<Vec<u8>, RequestFailure>;
 type ResponseReceiver = oneshot::Receiver<Response>;
 
 #[derive(Clone, Debug)]
-struct RequestInfo<B: Block> {
+struct RequestInfo<B: Block, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send> {
 	block: NumberFor<B>,
-	active_set: ValidatorSet<AuthorityId>,
+	active_set: ValidatorSet<AuthId>,
 }
 
-enum State<B: Block> {
+enum State<B: Block, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send> {
 	Idle,
-	AwaitingResponse(PeerId, RequestInfo<B>, ResponseReceiver),
+	AwaitingResponse(PeerId, RequestInfo<B, AuthId>, ResponseReceiver),
 }
 
-pub struct OnDemandJustificationsEngine<B: Block, R, AuthId: Encode + Decode + Debug + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> {
+pub struct OnDemandJustificationsEngine<B: Block, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> {
 	network: Arc<dyn NetworkRequest + Send + Sync>,
 	protocol_name: ProtocolName,
 
 	live_peers: Arc<Mutex<KnownPeers<B>>>,
 	peers_cache: VecDeque<PeerId>,
 
-	state: State<B>,
+	state: State<B, AuthId>,
 	_auth_id : PhantomData::<AuthId>,
 	_signature: PhantomData::<TSignature>,
 	_keystor: PhantomData::<BKS>,
 
 }
 
-impl<B, R, AuthId, TSignature, BKS> OnDemandJustificationsEngine<B, R, AuthId, TSignature, BKS>
+impl<B, AuthId, TSignature, BKS> OnDemandJustificationsEngine<B, AuthId, TSignature, BKS>
 where
 	B: Block,
-	R: ProvideRuntimeApi<B>,
-	AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash,
+	AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash,
 	TSignature: Encode + Decode + Debug + Clone + Sync + Send,
 	BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
-	R::Api: BeefyApi<B, AuthId>,
 {
 	pub fn new(
 		network: Arc<dyn NetworkRequest + Send + Sync>,
@@ -111,7 +110,7 @@ where
 		None
 	}
 
-	fn request_from_peer(&mut self, peer: PeerId, req_info: RequestInfo<B>) {
+	fn request_from_peer(&mut self, peer: PeerId, req_info: RequestInfo<B, AuthId>) {
 		debug!(
 			target: BEEFY_SYNC_LOG_TARGET,
 			"🥩 requesting justif #{:?} from peer {:?}", req_info.block, peer,
@@ -135,7 +134,7 @@ where
 	/// Start new justification request for `block`, if no other request is in progress.
 	///
 	/// `active_set` will be used to verify validity of potential responses.
-	pub fn request(&mut self, block: NumberFor<B>, active_set: ValidatorSet<AuthorityId>) {
+	pub fn request(&mut self, block: NumberFor<B>, active_set: ValidatorSet<AuthId>) {
 		// ignore new requests while there's already one pending
 		if matches!(self.state, State::AwaitingResponse(_, _, _)) {
 			return
@@ -171,7 +170,7 @@ where
 	fn process_response(
 		&mut self,
 		peer: PeerId,
-		req_info: &RequestInfo<B>,
+		req_info: &RequestInfo<B, AuthId>,
 		response: Result<Response, Canceled>,
 	) -> Result<BeefyVersionedFinalityProof<B, TSignature>, Error> {
 		response

client/beefy/src/import.rs

@@ -48,7 +48,7 @@ use crate::{
 /// Wraps a `inner: BlockImport` and ultimately defers to it.
 ///
 /// When using BEEFY, the block import worker should be using this block import object.
-pub struct BeefyBlockImport<Block: BlockT, Backend, RuntimeApi, I, AuthId: Encode + Decode + Debug + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> {
+pub struct BeefyBlockImport<Block: BlockT, Backend, RuntimeApi, I, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> {
 	backend: Arc<Backend>,
 	runtime: Arc<RuntimeApi>,
 	inner: I,
@@ -57,7 +57,7 @@ pub struct BeefyBlockImport<Block: BlockT, Backend, RuntimeApi, I, AuthId: Encod
 	_keystore: PhantomData::<BKS>
 }
 
-impl<Block: BlockT, BE, Runtime, I: Clone, AuthId: Encode + Decode + Debug + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> Clone for BeefyBlockImport<Block, BE, Runtime, I, AuthId, TSignature, BKS> {
+impl<Block: BlockT, BE, Runtime, I: Clone, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> Clone for BeefyBlockImport<Block, BE, Runtime, I, AuthId, TSignature, BKS> {
 	fn clone(&self) -> Self {
 		BeefyBlockImport {
 			backend: self.backend.clone(),
@@ -70,7 +70,7 @@ impl<Block: BlockT, BE, Runtime, I: Clone, AuthId: Encode + Decode + Debug + Ord
 	}
 }
 
-impl<Block: BlockT, BE, Runtime, I, AuthId: Encode + Decode + Debug + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> BeefyBlockImport<Block, BE, Runtime, I, AuthId, TSignature, BKS> {
+impl<Block: BlockT, BE, Runtime, I, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>> BeefyBlockImport<Block, BE, Runtime, I, AuthId, TSignature, BKS> {
 	/// Create a new BeefyBlockImport.
 	pub fn new(
 		backend: Arc<BE>,
@@ -88,7 +88,7 @@ where
 	BE: Backend<Block>,
 	Runtime: ProvideRuntimeApi<Block>,
 	Runtime::Api: BeefyApi<Block, AuthId> + Send,
-        AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash,
+        AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash,
 	TSignature: Encode + Decode + Debug + Clone + Sync + Send,
 	BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
 {
@@ -123,7 +123,7 @@ where
 		+ Sync,
 	Runtime: ProvideRuntimeApi<Block> + Send + Sync,
 	Runtime::Api: BeefyApi<Block, AuthId>,
-	AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash,
+	AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash,
 	TSignature: Encode + Decode + Debug + Clone + Sync + Send,
         BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
 {

client/beefy/src/justification.rs

@@ -30,7 +30,7 @@ pub type BeefyVersionedFinalityProof<Block, TSignature> =
 	beefy_primitives::VersionedFinalityProof<NumberFor<Block>, TSignature>;
 
 /// Decode and verify a Beefy FinalityProof.
-pub(crate) fn decode_and_verify_finality_proof<Block: BlockT, AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>>(
+pub(crate) fn decode_and_verify_finality_proof<Block: BlockT, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>>(
 	encoded: &[u8],
 	target_number: NumberFor<Block>,
 	validator_set: &ValidatorSet<AuthId>,
@@ -41,7 +41,7 @@ pub(crate) fn decode_and_verify_finality_proof<Block: BlockT, AuthId: Encode + D
 }
 
 /// Verify the Beefy finality proof against the validator set at the block it was generated.
-fn verify_with_validator_set<Block: BlockT, AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,>(
+fn verify_with_validator_set<Block: BlockT, AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash, TSignature: Encode + Decode + Debug + Clone + Sync + Send, BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,>(
 	target_number: NumberFor<Block>,
 	validator_set: &ValidatorSet<AuthId>,
 	proof: &BeefyVersionedFinalityProof<Block, TSignature>,
@@ -111,7 +111,7 @@ pub(crate) mod tests {
 	fn should_verify_with_validator_set<TKeyPair, AuthId, TSignature, BKS>()
     where
         TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSignature>,
-        AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash + BeefyAuthIdMaker,
+        AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash + BeefyAuthIdMaker,
           TSignature: Encode + Decode + Debug + Clone + Sync + Send + std::cmp::PartialEq  + 'static,
           BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>,
     {
@@ -193,7 +193,7 @@ pub(crate) mod tests {
 ()
     where
     TKeyPair : SimpleKeyPair + SimpleKeyPair<Public = AuthId, Signature = TSignature>,
-        AuthId: Encode + Decode + Debug + Ord + Sync + Send + std::hash::Hash + BeefyAuthIdMaker,
+        AuthId: Encode + Decode + Debug + Clone + Ord + Sync + Send + std::hash::Hash + BeefyAuthIdMaker,
         TSignature: Encode + Decode + Debug + Clone + Sync + Send + std::cmp::PartialEq  + 'static,
         BKS: BeefyKeystore<AuthId, TSignature, Public = AuthId>
     {

client/beefy/src/keystore.rs

@@ -41,7 +41,7 @@ use sp_application_crypto::Pair as app_crypto_Pair;
 /// wrapper around [`sp_keystore::SyncCryptoStore`] and allows to customize
 /// common cryptographic functionality.
 pub  trait BeefyKeystore<AuthorityId, TSignature> : From<Option<SyncCryptoStorePtr>> + Sync + Send where
-	AuthorityId: Encode + Decode + Debug + Ord + Sync + Send,
+	AuthorityId: Encode + Decode + Debug + Clone + Ord + Sync + Send,
 	TSignature:  Encode + Decode + Debug + Clone + Sync + Send,
 {
 	type Public : Encode + Decode + Debug + From<AuthorityId> + Into<AuthorityId>;