From 24f8cd72cf8f1dfea15582ce56766124f11335a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Sep 2021 14:36:25 +0200 Subject: [PATCH] Remove a where bound that isn't required anymore (#633) --- cumulus/client/consensus/aura/src/lib.rs | 6 ------ cumulus/client/consensus/relay-chain/src/lib.rs | 6 ------ cumulus/client/network/src/lib.rs | 12 +----------- .../client/network/src/wait_on_relay_chain_block.rs | 4 +--- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/cumulus/client/consensus/aura/src/lib.rs b/cumulus/client/consensus/aura/src/lib.rs index 319f38bbb2..9af7aad183 100644 --- a/cumulus/client/consensus/aura/src/lib.rs +++ b/cumulus/client/consensus/aura/src/lib.rs @@ -278,8 +278,6 @@ pub fn build_aura_consensus Box> where Block: BlockT, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, RBackend: Backend + 'static, CIDP: CreateInherentDataProviders + Send @@ -361,8 +359,6 @@ impl AuraConsensusBuilder where Block: BlockT, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, RBackend: Backend + 'static, CIDP: CreateInherentDataProviders + Send @@ -443,8 +439,6 @@ impl polkadot_client::E for AuraConsensusBuilder where Block: BlockT, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, RBackend: Backend + 'static, CIDP: CreateInherentDataProviders + Send diff --git a/cumulus/client/consensus/relay-chain/src/lib.rs b/cumulus/client/consensus/relay-chain/src/lib.rs index 79347c5073..61eeba1c3b 100644 --- a/cumulus/client/consensus/relay-chain/src/lib.rs +++ b/cumulus/client/consensus/relay-chain/src/lib.rs @@ -262,8 +262,6 @@ where >, BI: BlockImport + Send + Sync + 'static, RBackend: Backend + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, CIDP: CreateInherentDataProviders + 'static, { RelayChainConsensusBuilder::new( @@ -296,8 +294,6 @@ struct RelayChainConsensusBuilder { impl RelayChainConsensusBuilder where Block: BlockT, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, PF: Environment + Send + Sync + 'static, PF::Proposer: Proposer< Block, @@ -339,8 +335,6 @@ impl polkadot_client::ExecuteWithClient for RelayChainConsensusBuilder where Block: BlockT, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, PF: Environment + Send + Sync + 'static, PF::Proposer: Proposer< Block, diff --git a/cumulus/client/network/src/lib.rs b/cumulus/client/network/src/lib.rs index 5215752f1f..047c014ebe 100644 --- a/cumulus/client/network/src/lib.rs +++ b/cumulus/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 + Send + Sync + 'static, R::Api: ParachainHost, B: Backend + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { /// Get the included block of the given parachain in the relay chain. fn included_block( @@ -335,8 +333,6 @@ where P::Api: ParachainHost, B: Backend + 'static, BCE: BlockchainEvents + 'static + Send + Sync, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { fn validate( &mut self, @@ -395,8 +391,6 @@ pub fn build_block_announce_validator( ) -> Box + Send> where B: Backend + Send + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { BlockAnnounceValidatorBuilder::new( relay_chain_client, @@ -424,8 +418,6 @@ struct BlockAnnounceValidatorBuilder { impl BlockAnnounceValidatorBuilder where B: Backend + Send + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { /// Create a new instance of the builder. fn new( @@ -453,8 +445,6 @@ impl polkadot_client::ExecuteWithClient for BlockAnnounceValidatorBuilder where B: Backend + Send + 'static, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { type Output = Box + Send>; diff --git a/cumulus/client/network/src/wait_on_relay_chain_block.rs b/cumulus/client/network/src/wait_on_relay_chain_block.rs index dcf0ac5b7e..5bb086fba8 100644 --- a/cumulus/client/network/src/wait_on_relay_chain_block.rs +++ b/cumulus/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 WaitOnRelayChainBlock where B: Backend, BCE: BlockchainEvents, - // Rust bug: https://github.com/rust-lang/rust/issues/24159 - sc_client_api::StateBackendFor: sc_client_api::StateBackend>, { pub fn wait_on_relay_chain_block( &self,