Remove all remaining `<AuthorityId as RuntimeAppPublic>::Signature:

Send + Sync,` constraints

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

@@ -43,8 +43,6 @@ pub(crate) fn write_voter_state<B: BlockT, BE: AuxStore, AuthorityId: AuthorityI
 	backend: &BE,
 	state: &PersistedState<B, AuthorityId>,
 ) -> ClientResult<()>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	trace!(target: LOG_TARGET, "🥩 persisting {:?}", state);
 	AuxStore::insert_aux(backend, &[(WORKER_STATE_KEY, state.encode().as_slice())], &[])
@@ -66,7 +64,6 @@ pub(crate) fn load_persistent<B, BE, AuthorityId: AuthorityIdBound>(
 where
 	B: BlockT,
 	BE: Backend<B>,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	let version: Option<u32> = load_decode(backend, VERSION_KEY)?;
 

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

@@ -71,8 +71,6 @@ enum Consider {
 /// BEEFY gossip message type that gets encoded and sent on the network.
 #[derive(Debug, Encode, Decode)]
 pub(crate) enum GossipMessage<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// BEEFY message with commitment and single signature.
 	Vote(VoteMessage<NumberFor<B>, AuthorityId, <AuthorityId as RuntimeAppPublic>::Signature>),
@@ -81,8 +79,6 @@ where
 }
 
 impl<B: Block, AuthorityId: AuthorityIdBound> GossipMessage<B, AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// Return inner vote if this message is a Vote.
 	pub fn unwrap_vote(
@@ -122,8 +118,6 @@ where
 
 #[derive(Clone, Debug)]
 pub(crate) struct GossipFilterCfg<'a, B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub start: NumberFor<B>,
 	pub end: NumberFor<B>,
@@ -132,17 +126,13 @@ where
 
 #[derive(Clone, Debug)]
 struct FilterInner<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub start: NumberFor<B>,
 	pub end: NumberFor<B>,
 	pub validator_set: ValidatorSet<AuthorityId>,
 }
 
 struct Filter<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	// specifies live rounds
 	inner: Option<FilterInner<B, AuthorityId>>,
@@ -151,8 +141,6 @@ where
 }
 
 impl<B: Block, AuthorityId: AuthorityIdBound> Filter<B, AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub fn new() -> Self {
 		Self { inner: None, rounds_with_valid_proofs: BTreeSet::new() }
@@ -242,7 +230,6 @@ where
 pub(crate) struct GossipValidator<B, N, AuthorityId: AuthorityIdBound>
 where
 	B: Block,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	votes_topic: B::Hash,
 	justifs_topic: B::Hash,
@@ -256,11 +243,10 @@ impl<B, N,AuthorityId> GossipValidator<B, N,AuthorityId>
 where
 	B: Block,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub(crate) fn new(known_peers: Arc<Mutex<KnownPeers<B>>>, network: Arc<N>) -> Self {
 		Self {
-			votes_topic: votes_topic::<B>(),
+		votes_topic: votes_topic::<B>(),
 			justifs_topic: proofs_topic::<B>(),
 			gossip_filter: RwLock::new(Filter::new()),
 			next_rebroadcast: Mutex::new(Instant::now() + REBROADCAST_AFTER),

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

@@ -51,25 +51,19 @@ type ResponseReceiver = oneshot::Receiver<Response>;
 
 #[derive(Clone, Debug)]
 struct RequestInfo<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	block: NumberFor<B>,
 	active_set: ValidatorSet<AuthorityId>,
 }
 
 enum State<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	Idle,
 	AwaitingResponse(PeerId, RequestInfo<B, AuthorityId>, ResponseReceiver),
 }
 
 /// Possible engine responses.
 pub(crate) enum ResponseInfo<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// No peer response available yet.
 	Pending,
@@ -80,8 +74,6 @@ where
 }
 
 pub struct OnDemandJustificationsEngine<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	network: Arc<dyn NetworkRequest + Send + Sync>,
 	protocol_name: ProtocolName,
@@ -94,8 +86,6 @@ where
 }
 
 impl<B: Block, AuthorityId: AuthorityIdBound> OnDemandJustificationsEngine<B, AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub fn new(
 		network: Arc<dyn NetworkRequest + Send + Sync>,

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

@@ -47,8 +47,6 @@ use crate::{
 ///
 /// When using BEEFY, the block import worker should be using this block import object.
 pub struct BeefyBlockImport<Block: BlockT, Backend, RuntimeApi, I, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	backend: Arc<Backend>,
 	runtime: Arc<RuntimeApi>,
@@ -59,8 +57,6 @@ where
 
 impl<Block: BlockT, BE, Runtime, I: Clone, AuthorityId: AuthorityIdBound> Clone
 	for BeefyBlockImport<Block, BE, Runtime, I, AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	fn clone(&self) -> Self {
 		BeefyBlockImport {
@@ -75,8 +71,6 @@ where
 
 impl<Block: BlockT, BE, Runtime, I, AuthorityId: AuthorityIdBound>
 	BeefyBlockImport<Block, BE, Runtime, I, AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// Create a new BeefyBlockImport.
 	pub fn new(
@@ -97,7 +91,6 @@ where
 	Runtime: ProvideRuntimeApi<Block>,
 	Runtime::Api: BeefyApi<Block, AuthorityId> + Send,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	fn decode_and_verify(
 		&self,
@@ -137,7 +130,6 @@ where
 	Runtime: ProvideRuntimeApi<Block> + Send + Sync,
 	Runtime::Api: BeefyApi<Block, AuthorityId>,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	type Error = ConsensusError;
 

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

@@ -30,8 +30,6 @@ pub type BeefyVersionedFinalityProof<Block, AuthorityId> =
 pub(crate) fn proof_block_num_and_set_id<Block: BlockT, AuthorityId: AuthorityIdBound>(
 	proof: &BeefyVersionedFinalityProof<Block, AuthorityId>,
 ) -> (NumberFor<Block>, ValidatorSetId)
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	match proof {
 		VersionedFinalityProof::V1(sc) =>
@@ -45,8 +43,6 @@ pub(crate) fn decode_and_verify_finality_proof<Block: BlockT, AuthorityId: Autho
 	target_number: NumberFor<Block>,
 	validator_set: &ValidatorSet<AuthorityId>,
 ) -> Result<BeefyVersionedFinalityProof<Block, AuthorityId>, (ConsensusError, u32)>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	let proof = <BeefyVersionedFinalityProof<Block, AuthorityId>>::decode_all(&mut &*encoded)
 		.map_err(|_| (ConsensusError::InvalidJustification, 0))?;

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

@@ -176,8 +176,6 @@ impl<AuthorityId: AuthorityIdBound> BeefyKeystore<AuthorityId> {
 }
 
 impl<AuthorityId: AuthorityIdBound> From<Option<KeystorePtr>> for BeefyKeystore<AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	fn from(store: Option<KeystorePtr>) -> BeefyKeystore<AuthorityId> {
 		BeefyKeystore(store, PhantomData)

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

@@ -120,8 +120,6 @@ where
 /// to be used by the voter.
 #[derive(Clone)]
 pub struct BeefyVoterLinks<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	// BlockImport -> Voter links
 	/// Stream of BEEFY signed commitments from block import to voter.
@@ -137,8 +135,6 @@ where
 /// Links used by the BEEFY RPC layer, from the BEEFY background voter.
 #[derive(Clone)]
 pub struct BeefyRPCLinks<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// Stream of signed commitments coming from the voter.
 	pub from_voter_justif_stream: BeefyVersionedFinalityProofStream<B, AuthorityId>,
@@ -164,7 +160,6 @@ where
 	RuntimeApi: ProvideRuntimeApi<B> + Send + Sync,
 	RuntimeApi::Api: BeefyApi<B, AuthorityId>,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	// Voter -> RPC links
 	let (to_rpc_justif_sender, from_voter_justif_stream) =
@@ -215,8 +210,6 @@ pub struct BeefyNetworkParams<B: Block, N, S> {
 
 /// BEEFY gadget initialization parameters.
 pub struct BeefyParams<B: Block, BE, C, N, P, R, S, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// BEEFY client
 	pub client: Arc<C>,
@@ -245,8 +238,6 @@ where
 ///
 /// These are created once, but will be reused if worker is restarted/reinitialized.
 pub(crate) struct BeefyComms<B: Block, N, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub gossip_engine: GossipEngine<B>,
 	pub gossip_validator: Arc<GossipValidator<B, N, AuthorityId>>,
@@ -260,8 +251,6 @@ where
 /// GossipEngine. Once initialization is done, the GossipEngine (and other pieces) are added to get
 /// the complete [worker::BeefyWorker] object.
 pub(crate) struct BeefyWorkerBuilder<B: Block, BE, RuntimeApi, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	// utilities
 	backend: Arc<BE>,
@@ -279,7 +268,6 @@ where
 	R: ProvideRuntimeApi<B>,
 	R::Api: BeefyApi<B, AuthorityId>,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	/// This will wait for the chain to enable BEEFY (if not yet enabled) and also wait for the
 	/// backend to sync all headers required by the voter to build a contiguous chain of mandatory
@@ -518,7 +506,6 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S, AuthorityId>(
 	N: GossipNetwork<B> + NetworkRequest + Send + Sync + 'static,
 	S: GossipSyncing<B> + SyncOracle + 'static,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	let BeefyParams {
 		client,
@@ -685,7 +672,6 @@ where
 	B: Block,
 	R: ProvideRuntimeApi<B>,
 	R::Api: BeefyApi<B, AuthorityId>,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	info!(target: LOG_TARGET, "🥩 BEEFY gadget waiting for BEEFY pallet to become available...");
 	loop {
@@ -724,7 +710,6 @@ where
 	BE: Backend<B>,
 	R: ProvideRuntimeApi<B>,
 	R::Api: BeefyApi<B, AuthorityId>,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	let blockchain = backend.blockchain();
 	// Walk up the chain looking for the validator set active at 'at_header'. Process both state and

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

@@ -34,24 +34,18 @@ use std::collections::BTreeMap;
 /// Does not do any validation on votes or signatures, layers above need to handle that (gossip).
 #[derive(Debug, Decode, Encode, PartialEq)]
 pub(crate) struct RoundTracker<AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	votes: BTreeMap<AuthorityId, <AuthorityId as RuntimeAppPublic>::Signature>,
 }
 
 impl<AuthorityId: AuthorityIdBound> Default for RoundTracker<AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	fn default() -> Self {
 		Self { votes: Default::default() }
 	}
 }
 
 impl<AuthorityId: AuthorityIdBound> RoundTracker<AuthorityId>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	fn add_vote(
 		&mut self,
@@ -78,8 +72,6 @@ pub fn threshold(authorities: usize) -> usize {
 
 #[derive(Debug, PartialEq)]
 pub enum VoteImportResult<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	Ok,
 	RoundConcluded(SignedCommitment<NumberFor<B>, <AuthorityId as RuntimeAppPublic>::Signature>),
@@ -95,8 +87,6 @@ where
 /// Does not do any validation on votes or signatures, layers above need to handle that (gossip).
 #[derive(Debug, Decode, Encode, PartialEq)]
 pub(crate) struct Rounds<B: Block, AuthorityId: AuthorityIdBound>
-where
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	rounds: BTreeMap<Commitment<NumberFor<B>>, RoundTracker<AuthorityId>>,
 	previous_votes: BTreeMap<
@@ -113,7 +103,6 @@ impl<B, AuthorityId> Rounds<B, AuthorityId>
 where
 	B: Block,
 	AuthorityId: AuthorityIdBound,
-	<AuthorityId as RuntimeAppPublic>::Signature: Send + Sync,
 {
 	pub(crate) fn new(
 		session_start: NumberFor<B>,