Unverified Commit c435c187 authored by Wei Tang's avatar Wei Tang Committed by GitHub
Browse files

Companion PR for #6862 (#1564)



* Companion PR for #6862

* Check in Cargo.lock for CI

* "Update Substrate"

* update substrate

Co-authored-by: parity-processbot <>
Co-authored-by: André Silva's avatarAndré Silva <andre.beat@gmail.com>
parent e750a825
Pipeline #104037 failed with stages
in 9 minutes and 56 seconds
This diff is collapsed.
......@@ -33,6 +33,7 @@ use polkadot_subsystem::DummySubsystem;
use polkadot_node_core_proposer::ProposerFactory;
use sp_trie::PrefixedMemoryDB;
use sp_core::traits::SpawnNamed;
use sc_client_api::ExecutorProvider;
pub use service::{
Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis,
TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor,
......@@ -225,6 +226,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration) -> Result<
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()),
)?;
let justification_stream = grandpa_link.justification_stream();
......@@ -319,7 +321,6 @@ fn new_full<RuntimeApi, Executor>(
RuntimeApiCollection<StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>,
Executor: NativeExecutionDispatch + 'static,
{
use sc_client_api::ExecutorProvider;
use sp_core::traits::BareCryptoStorePtr;
let is_collator = collating_for.is_some();
......@@ -576,6 +577,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<TaskManager
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
consensus_common::NeverCanAuthor,
)?;
let finality_proof_provider =
......
......@@ -30,6 +30,7 @@ use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
use sc_executor::native_executor_instance;
use log::info;
use sp_trie::PrefixedMemoryDB;
use sc_client_api::ExecutorProvider;
use prometheus_endpoint::Registry;
pub use service::{
Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis, RpcHandlers,
......@@ -195,6 +196,7 @@ pub fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, test: bool)
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone()),
)?;
let justification_stream = grandpa_link.justification_stream();
......@@ -266,7 +268,6 @@ pub fn new_full<RuntimeApi, Executor>(
Executor: NativeExecutionDispatch + 'static,
{
use sc_network::Event;
use sc_client_api::ExecutorProvider;
use futures::stream::StreamExt;
use sp_core::traits::BareCryptoStorePtr;
......@@ -615,6 +616,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManage
inherent_data_providers.clone(),
&task_manager.spawn_handle(),
config.prometheus_registry(),
consensus_common::NeverCanAuthor,
)?;
let finality_proof_provider =
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment