Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix collator interfaces to make them work with Cumulus #1048

Merged
merged 2 commits into from
Apr 28, 2020
Merged

Fix collator interfaces to make them work with Cumulus #1048

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ce4a2
Fix collator interfaces to make them work with Cumulus
bkchr Apr 28, 2020
2d7e22d
Fix the fix
bkchr Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions collator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ use std::pin::Pin;

use futures::{future, Future, Stream, FutureExt, TryFutureExt, StreamExt, task::Spawn};
use log::warn;
use sc_client_api::StateBackend;
use sc_client_api::{StateBackend, BlockchainEvents};
use sp_core::Pair;
use polkadot_primitives::{
BlockId, Hash, Block,
Expand Down Expand Up @@ -128,7 +128,7 @@ pub trait BuildParachainContext {
network: impl Network + Clone + 'static,
) -> Result<Self::ParachainContext, ()>
where
Client: ProvideRuntimeApi<Block>,
Client: ProvideRuntimeApi<Block> + Send + Sync + BlockchainEvents<Block> + 'static,
Client::Api: RuntimeApiCollection<Extrinsic>,
<Client::Api as ApiExt<Block>>::StateBackend: StateBackend<HashFor<Block>>,
Extrinsic: codec::Codec + Send + Sync + 'static,
Expand Down Expand Up @@ -200,7 +200,6 @@ pub async fn collate<P>(
Ok(collation)
}


fn build_collator_service<SP, P, C, E, R, Extrinsic>(
spawner: SP,
handles: polkadot_service::FullNodeHandles,
Expand Down