Fix collator interfaces to make them work with Cumulus (#1048)

* Fix collator interfaces to make them work with Cumulus

* Fix the fix
This commit is contained in:
Bastian Köcher
2020-04-28 17:49:21 +02:00
committed by GitHub
parent 0e0760d56c
commit 365af458af
+2 -3
View File
@@ -52,7 +52,7 @@ use std::pin::Pin;
use futures::{future, Future, Stream, FutureExt, TryFutureExt, StreamExt, task::Spawn}; use futures::{future, Future, Stream, FutureExt, TryFutureExt, StreamExt, task::Spawn};
use log::warn; use log::warn;
use sc_client_api::StateBackend; use sc_client_api::{StateBackend, BlockchainEvents};
use sp_core::Pair; use sp_core::Pair;
use polkadot_primitives::{ use polkadot_primitives::{
BlockId, Hash, Block, BlockId, Hash, Block,
@@ -128,7 +128,7 @@ pub trait BuildParachainContext {
network: impl Network + Clone + 'static, network: impl Network + Clone + 'static,
) -> Result<Self::ParachainContext, ()> ) -> Result<Self::ParachainContext, ()>
where where
Client: ProvideRuntimeApi<Block>, Client: ProvideRuntimeApi<Block> + Send + Sync + BlockchainEvents<Block> + 'static,
Client::Api: RuntimeApiCollection<Extrinsic>, Client::Api: RuntimeApiCollection<Extrinsic>,
<Client::Api as ApiExt<Block>>::StateBackend: StateBackend<HashFor<Block>>, <Client::Api as ApiExt<Block>>::StateBackend: StateBackend<HashFor<Block>>,
Extrinsic: codec::Codec + Send + Sync + 'static, Extrinsic: codec::Codec + Send + Sync + 'static,
@@ -200,7 +200,6 @@ pub async fn collate<P>(
Ok(collation) Ok(collation)
} }
fn build_collator_service<SP, P, C, E, R, Extrinsic>( fn build_collator_service<SP, P, C, E, R, Extrinsic>(
spawner: SP, spawner: SP,
handles: polkadot_service::FullNodeHandles, handles: polkadot_service::FullNodeHandles,