aura: remove unneeded SlotDuration struct and rename digest -> digests (#4958)

* aura: remove unneeded SlotDuration struct and rename digest -> digests

* aura: add alias type for SlotDuration

* aura: fix tests

* Fix missing parameters in get_or_compute

* Use special function for fetching aura slot_duration
This commit is contained in:
Wei Tang
2020-02-21 10:48:18 +01:00
committed by GitHub
parent 353e7a068f
commit 47f209a7a5
3 changed files with 19 additions and 31 deletions
@@ -57,7 +57,7 @@ macro_rules! new_full_start {
);
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>(
sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
sc_consensus_aura::slot_duration(&*client)?,
aura_block_import,
Some(Box::new(grandpa_block_import.clone())),
None,
@@ -115,7 +115,7 @@ pub fn new_full(config: Configuration<GenesisConfig>)
sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
let aura = sc_consensus_aura::start_aura::<_, _, _, _, _, AuraPair, _, _, _>(
sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
sc_consensus_aura::slot_duration(&*client)?,
client,
select_chain,
block_import,
@@ -220,7 +220,7 @@ pub fn new_light(config: Configuration<GenesisConfig>)
finality_proof_import.create_finality_proof_request_builder();
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, ()>(
sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
sc_consensus_aura::slot_duration(&*client)?,
grandpa_block_import,
None,
Some(Box::new(finality_proof_import)),