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

Node template complete import pipeline #7014

Merged
merged 2 commits into from
Sep 7, 2020
Merged

Node template complete import pipeline #7014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8e8af
Use complete import pipeline
JoshOrndorff Sep 2, 2020
8948399
Line length
danforbes Sep 2, 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
11 changes: 8 additions & 3 deletions bin/node-template/node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
sp_consensus::DefaultImportQueue<Block, FullClient>,
sc_transaction_pool::FullPool<Block, FullClient>,
(
sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
sc_consensus_aura::AuraBlockImport<
Block,
FullClient,
sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
AuraPair
>,
sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>
)
>, ServiceError> {
Expand Down Expand Up @@ -56,7 +61,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen

let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
sc_consensus_aura::slot_duration(&*client)?,
aura_block_import,
aura_block_import.clone(),
Some(Box::new(grandpa_block_import.clone())),
None,
client.clone(),
Expand All @@ -69,7 +74,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
Ok(sc_service::PartialComponents {
client, backend, task_manager, import_queue, keystore, select_chain, transaction_pool,
inherent_data_providers,
other: (grandpa_block_import, grandpa_link),
other: (aura_block_import, grandpa_link),
})
}

Expand Down