From a2073771a064fcab29234ac0a45f663d27c5b7f7 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 30 Jul 2024 17:03:15 +0200 Subject: [PATCH] fix after merge --- bin/collator/src/parachain/service.rs | 43 +++++++++++++-------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index d94b155101..efb3d3efef 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -960,35 +960,32 @@ where let verifier_client = client.clone(); let aura_verifier = move || { - Box::new(cumulus_client_consensus_aura::build_verifier::< - AuraPair, - _, - _, - _, - >(sc_consensus_aura::BuildVerifierParams { - client: verifier_client.clone(), - create_inherent_data_providers: move |parent_hash, _| { - let cidp_client = verifier_client.clone(); - async move { - let slot_duration = cumulus_client_consensus_aura::slot_duration_at( - &*cidp_client, - parent_hash, - )?; - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = + Box::new(sc_consensus_aura::build_verifier::( + sc_consensus_aura::BuildVerifierParams { + client: verifier_client.clone(), + create_inherent_data_providers: move |parent_hash, _| { + let cidp_client = verifier_client.clone(); + async move { + let slot_duration = cumulus_client_consensus_aura::slot_duration_at( + &*cidp_client, + parent_hash, + )?; + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); - Ok((slot, timestamp)) - } + Ok((slot, timestamp)) + } + }, + telemetry: telemetry_handle, + check_for_equivocation: sc_consensus_aura::CheckForEquivocation::Yes, + compatibility_mode: sc_consensus_aura::CompatibilityMode::None, }, - telemetry: telemetry_handle, - check_for_equivocation: sc_consensus_aura::CheckForEquivocation::Yes, - compatibility_mode: sc_consensus_aura::CompatibilityMode::None, - })) as Box<_> + )) as Box<_> }; let relay_chain_verifier = Box::new(RelayChainVerifier::new(client.clone(), |_, _| async {