pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-09 19:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion PR for #6862 (#1564)

Browse Source 
* Companion PR for #6862

* Check in Cargo.lock for CI

* "Update Substrate"

* update substrate

Co-authored-by: parity-processbot <>
Co-authored-by: André Silva <andre.beat@gmail.com>
This commit is contained in:
Wei Tang
2020-08-17 14:33:30 +02:00
committed by GitHub
parent 54bec3bfc0
commit 944b1bd0b4
3 changed files with 148 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+142 -141
View File
File diff suppressed because it is too large Load Diff
polkadot/node/service/src/lib.rs
+3 -1
View File
@@ -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 =
polkadot/service/src/lib.rs
+3 -1
View File
@@ -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 =