OneDotZero
/
solutions
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport paritytech/substrate#7014 (#81)

main
Dan Forbes 2020-09-08 13:00:22 -07:00 committed by GitHub
parent 87f70c66f2
commit fcd577e817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/src/service.rs
View File

@ -27,7 +27,12 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
sp_consensus::DefaultImportQueue<Block, FullClient>, sp_consensus::DefaultImportQueue<Block, FullClient>,
sc_transaction_pool::FullPool<Block, FullClient>, sc_transaction_pool::FullPool<Block, FullClient>,
( (
sc_consensus_aura::AuraBlockImport<
Block,
FullClient,
sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>, sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
AuraPair
>,
sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain> sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>
) )
>, ServiceError> { >, ServiceError> {
@ -56,7 +61,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>( let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _, _>(
sc_consensus_aura::slot_duration(&*client)?, sc_consensus_aura::slot_duration(&*client)?,
aura_block_import, aura_block_import.clone(),
Some(Box::new(grandpa_block_import.clone())), Some(Box::new(grandpa_block_import.clone())),
None, None,
client.clone(), client.clone(),
@ -69,7 +74,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
Ok(sc_service::PartialComponents { Ok(sc_service::PartialComponents {
client, backend, task_manager, import_queue, keystore, select_chain, transaction_pool, client, backend, task_manager, import_queue, keystore, select_chain, transaction_pool,
inherent_data_providers, inherent_data_providers,
other: (grandpa_block_import, grandpa_link), other: (aura_block_import, grandpa_link),
}) })
} }