pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 16:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion PR for #5647 (#1035)

Browse Source
This commit is contained in:
pscott
2020-04-29 18:46:51 +02:00
committed by GitHub
parent c1ecc9b6cd
commit 15c0e6e3ed
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/service/src/lib.rs
+6 -2
View File
@@ -163,7 +163,7 @@ macro_rules! new_full_start {
let pool = sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api), prometheus_registry);
Ok(pool)
})?
.with_import_queue(|config, client, mut select_chain, _| {
.with_import_queue(|config, client, mut select_chain, _, spawn_task_handle| {
let select_chain = select_chain.take()
.ok_or_else(|| service::Error::SelectChainRequired)?;
@@ -189,6 +189,7 @@ macro_rules! new_full_start {
client.clone(),
)?;
let spawner = |future| spawn_task_handle.spawn_blocking("import-queue-worker", future);
let import_queue = babe::import_queue(
babe_link.clone(),
block_import.clone(),
@@ -196,6 +197,7 @@ macro_rules! new_full_start {
None,
client,
inherent_data_providers.clone(),
spawner,
)?;
import_setup = Some((block_import, grandpa_link, babe_link));
@@ -508,7 +510,7 @@ macro_rules! new_light {
);
Ok(pool)
})?
.with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _| {
.with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _, spawn_task_handle| {
let fetch_checker = fetcher
.map(|fetcher| fetcher.checker().clone())
.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
@@ -526,6 +528,7 @@ macro_rules! new_light {
client.clone(),
)?;
let spawner = |future| spawn_task_handle.spawn_blocking("importe-queue-worker", future);
// FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`.
let import_queue = babe::import_queue(
babe_link,
@@ -534,6 +537,7 @@ macro_rules! new_light {
Some(Box::new(finality_proof_import)),
client,
inherent_data_providers.clone(),
spawner,
)?;
Ok((import_queue, finality_proof_request_builder))