ci: add quick-check with rustfmt (#615)

* ci: add quick-check with clippy and rustfmt

* chore: rustfmt round

* chore: set the same rustfmt config than substrate

* chore: fix formatting

* cI: remove clippy

* ci: switch to nightly for the checks

* ci: fix toolchains and naming

* ci: Limit the check to formatting

* chore: fix formatting

* Update .rustfmt.toml

* Update .rustfmt.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Chevdor
2021-09-16 16:57:52 +02:00
committed by GitHub
parent 035a576008
commit 1dd000a011
98 changed files with 1244 additions and 1872 deletions
@@ -40,11 +40,7 @@ pub struct Verifier<Client, Block, CIDP> {
impl<Client, Block, CIDP> Verifier<Client, Block, CIDP> {
/// Create a new instance.
pub fn new(client: Arc<Client>, create_inherent_data_providers: CIDP) -> Self {
Self {
client,
create_inherent_data_providers,
_marker: PhantomData,
}
Self { client, create_inherent_data_providers, _marker: PhantomData }
}
}
@@ -59,13 +55,7 @@ where
async fn verify(
&mut self,
mut block_params: BlockImportParams<Block, ()>,
) -> Result<
(
BlockImportParams<Block, ()>,
Option<Vec<(CacheKeyId, Vec<u8>)>>,
),
String,
> {
) -> Result<(BlockImportParams<Block, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
if let Some(inner_body) = block_params.body.take() {
let inherent_data_providers = self
.create_inherent_data_providers
@@ -73,9 +63,8 @@ where
.await
.map_err(|e| e.to_string())?;
let inherent_data = inherent_data_providers
.create_inherent_data()
.map_err(|e| format!("{:?}", e))?;
let inherent_data =
inherent_data_providers.create_inherent_data().map_err(|e| format!("{:?}", e))?;
let block = Block::new(block_params.header.clone(), inner_body);
@@ -130,9 +119,7 @@ where
Ok(BasicQueue::new(
verifier,
Box::new(cumulus_client_consensus_common::ParachainBlockImport::new(
block_import,
)),
Box::new(cumulus_client_consensus_common::ParachainBlockImport::new(block_import)),
None,
spawner,
registry,
+4 -9
View File
@@ -180,15 +180,10 @@ where
)
.ok()?;
let inherent_data = self
.inherent_data(parent.hash(), &validation_data, relay_parent)
.await?;
let inherent_data =
self.inherent_data(parent.hash(), &validation_data, relay_parent).await?;
let Proposal {
block,
storage_changes,
proof,
} = proposer
let Proposal { block, storage_changes, proof } = proposer
.propose(
inherent_data,
Default::default(),
@@ -226,7 +221,7 @@ where
"Error importing build block.",
);
return None;
return None
}
Some(ParachainCandidate { block, proof })