Remove a where bound that isn't required anymore (#633)

paritytech · Sep 30, 2021 · 36d18c0 · 36d18c0
1 parent 1a6491b
commit 36d18c0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 26 deletions.
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
@@ -278,8 +278,6 @@ pub fn build_aura_consensus<P, Block, PF, BI, RBackend, CIDP, Client, SO, BS, Er
 ) -> Box<dyn ParachainConsensus<Block>>
 where
 	Block: BlockT,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	RBackend: Backend<PBlock> + 'static,
 	CIDP: CreateInherentDataProviders<Block, (PHash, PersistedValidationData)>
 		+ Send
@@ -361,8 +359,6 @@ impl<Block, PF, BI, RBackend, CIDP, Client, SO, BS, P, Error>
 	AuraConsensusBuilder<P, Block, PF, BI, RBackend, CIDP, Client, SO, BS, Error>
 where
 	Block: BlockT,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	RBackend: Backend<PBlock> + 'static,
 	CIDP: CreateInherentDataProviders<Block, (PHash, PersistedValidationData)>
 		+ Send
@@ -443,8 +439,6 @@ impl<Block, PF, BI, RBackend, CIDP, Client, SO, BS, P, Error> polkadot_client::E
 	for AuraConsensusBuilder<P, Block, PF, BI, RBackend, CIDP, Client, SO, BS, Error>
 where
 	Block: BlockT,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	RBackend: Backend<PBlock> + 'static,
 	CIDP: CreateInherentDataProviders<Block, (PHash, PersistedValidationData)>
 		+ Send

diff --git a/client/consensus/relay-chain/src/lib.rs b/client/consensus/relay-chain/src/lib.rs
@@ -262,8 +262,6 @@ where
 	>,
 	BI: BlockImport<Block> + Send + Sync + 'static,
 	RBackend: Backend<PBlock> + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	CIDP: CreateInherentDataProviders<Block, (PHash, PersistedValidationData)> + 'static,
 {
 	RelayChainConsensusBuilder::new(
@@ -296,8 +294,6 @@ struct RelayChainConsensusBuilder<Block, PF, BI, RBackend, CIDP> {
 impl<Block, PF, BI, RBackend, CIDP> RelayChainConsensusBuilder<Block, PF, BI, RBackend, CIDP>
 where
 	Block: BlockT,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	PF: Environment<Block> + Send + Sync + 'static,
 	PF::Proposer: Proposer<
 		Block,
@@ -339,8 +335,6 @@ impl<Block, PF, BI, RBackend, CIDP> polkadot_client::ExecuteWithClient
 	for RelayChainConsensusBuilder<Block, PF, BI, RBackend, CIDP>
 where
 	Block: BlockT,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<RBackend, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 	PF: Environment<Block> + Send + Sync + 'static,
 	PF::Proposer: Proposer<
 		Block,

diff --git a/client/network/src/lib.rs b/client/network/src/lib.rs
@@ -30,7 +30,7 @@ use sp_consensus::{
 use sp_core::traits::SpawnNamed;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT},
+	traits::{Block as BlockT, Header as HeaderT},
 };
 
 use polkadot_client::ClientHandle;
@@ -245,8 +245,6 @@ where
 	R: ProvideRuntimeApi<PBlock> + Send + Sync + 'static,
 	R::Api: ParachainHost<PBlock>,
 	B: Backend<PBlock> + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	/// Get the included block of the given parachain in the relay chain.
 	fn included_block(
@@ -335,8 +333,6 @@ where
 	P::Api: ParachainHost<PBlock>,
 	B: Backend<PBlock> + 'static,
 	BCE: BlockchainEvents<PBlock> + 'static + Send + Sync,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	fn validate(
 		&mut self,
@@ -395,8 +391,6 @@ pub fn build_block_announce_validator<Block: BlockT, B>(
 ) -> Box<dyn BlockAnnounceValidatorT<Block> + Send>
 where
 	B: Backend<PBlock> + Send + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	BlockAnnounceValidatorBuilder::new(
 		relay_chain_client,
@@ -424,8 +418,6 @@ struct BlockAnnounceValidatorBuilder<Block, B> {
 impl<Block: BlockT, B> BlockAnnounceValidatorBuilder<Block, B>
 where
 	B: Backend<PBlock> + Send + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	/// Create a new instance of the builder.
 	fn new(
@@ -453,8 +445,6 @@ impl<Block: BlockT, B> polkadot_client::ExecuteWithClient
 	for BlockAnnounceValidatorBuilder<Block, B>
 where
 	B: Backend<PBlock> + Send + 'static,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	type Output = Box<dyn BlockAnnounceValidatorT<Block> + Send>;
 

diff --git a/client/network/src/wait_on_relay_chain_block.rs b/client/network/src/wait_on_relay_chain_block.rs
@@ -22,7 +22,7 @@ use sc_client_api::{
 	blockchain::{self, BlockStatus, HeaderBackend},
 	Backend, BlockchainEvents,
 };
-use sp_runtime::{generic::BlockId, traits::HashFor};
+use sp_runtime::generic::BlockId;
 use std::{sync::Arc, time::Duration};
 
 /// The timeout in seconds after that the waiting for a block should be aborted.
@@ -85,8 +85,6 @@ impl<B, BCE> WaitOnRelayChainBlock<B, BCE>
 where
 	B: Backend<PBlock>,
 	BCE: BlockchainEvents<PBlock>,
-	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	sc_client_api::StateBackendFor<B, PBlock>: sc_client_api::StateBackend<HashFor<PBlock>>,
 {
 	pub fn wait_on_relay_chain_block(
 		&self,