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

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
rphmeier committed Jul 19, 2023
1 parent 951fea5 commit 4a5ec22
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 18 deletions.
13 changes: 7 additions & 6 deletions client/consensus/aura/src/collators/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,17 @@ where
continue
}

match params.relay_client.candidate_pending_availability(
*request.relay_parent(),
params.para_id,
).await {
match params
.relay_client
.candidate_pending_availability(*request.relay_parent(), params.para_id)
.await
{
Err(e) => reject_with_error!(e),
Ok(Some(_)) => {
tracing::info!(target: crate::LOG_TARGET, "Basic mode - don't author when pending availability");
continue
}
Ok(None) => {}
},
Ok(None) => {},
}

let relay_parent_header =
Expand Down
38 changes: 26 additions & 12 deletions polkadot-parachain/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
use codec::Codec;
use cumulus_client_cli::CollatorOptions;
use cumulus_client_collator::service::CollatorService;
use cumulus_client_consensus_aura::collators::basic::{self as basic_aura, Params as BasicAuraParams};
use cumulus_client_consensus_aura::collators::basic::{
self as basic_aura, Params as BasicAuraParams,
};
use cumulus_client_consensus_common::{
ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus,
};
Expand Down Expand Up @@ -826,10 +828,17 @@ pub async fn start_rococo_parachain_node(
authoring_duration: Duration::from_millis(500),
};

let fut =
basic_aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _>(
params,
);
let fut = basic_aura::run::<
Block,
sp_consensus_aura::sr25519::AuthorityPair,
_,
_,
_,
_,
_,
_,
_,
>(params);
task_manager.spawn_essential_handle().spawn("aura", None, fut);

Ok(())
Expand Down Expand Up @@ -1224,9 +1233,7 @@ where
};

let fut =
basic_aura::run::<Block, <AuraId as AppCrypto>::Pair, _, _, _, _, _, _, _>(
params,
);
basic_aura::run::<Block, <AuraId as AppCrypto>::Pair, _, _, _, _, _, _, _>(params);
task_manager.spawn_essential_handle().spawn("aura", None, fut);

Ok(())
Expand Down Expand Up @@ -1539,10 +1546,17 @@ pub async fn start_contracts_rococo_node(
authoring_duration: Duration::from_millis(500),
};

let fut =
basic_aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _>(
params,
);
let fut = basic_aura::run::<
Block,
sp_consensus_aura::sr25519::AuthorityPair,
_,
_,
_,
_,
_,
_,
_,
>(params);
task_manager.spawn_essential_handle().spawn("aura", None, fut);

Ok(())
Expand Down

0 comments on commit 4a5ec22

Please sign in to comment.