Run cargo fmt on the whole code base (#9394)

* Run cargo fmt on the whole code base * Second run * Add CI check * Fix compilation * More unnecessary braces * Handle weights * Use --all * Use correct attributes... * Fix UI tests * AHHHHHHHHH * 🤦 * Docs * Fix compilation * 🤷 * Please stop * 🤦 x 2 * More * make rustfmt.toml consistent with polkadot Co-authored-by: André Silva <andrerfosilva@gmail.com>
2026-04-30 00:17:56 +00:00 · 2021-07-21 16:32:32 +02:00
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -17,18 +17,22 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 //! Verification for BABE headers.
-use sp_runtime::{traits::Header, traits::DigestItemFor};
-use sp_core::{Pair, Public};
-use sp_consensus_babe::{make_transcript, AuthoritySignature, AuthorityPair, AuthorityId};
-use sp_consensus_babe::digests::{
-	PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest, SecondaryVRFPreDigest,
-	CompatibleDigestItem
+use super::{
+	authorship::{calculate_primary_threshold, check_primary_threshold, secondary_slot_author},
+	babe_err, find_pre_digest, BlockT, Epoch, Error,
 };
-use sc_consensus_slots::CheckedHeader;
-use sp_consensus_slots::Slot;
 use log::{debug, trace};
-use super::{find_pre_digest, babe_err, Epoch, BlockT, Error};
-use super::authorship::{calculate_primary_threshold, check_primary_threshold, secondary_slot_author};
+use sc_consensus_slots::CheckedHeader;
+use sp_consensus_babe::{
+	digests::{
+		CompatibleDigestItem, PreDigest, PrimaryPreDigest, SecondaryPlainPreDigest,
+		SecondaryVRFPreDigest,
+	},
+	make_transcript, AuthorityId, AuthorityPair, AuthoritySignature,
+};
+use sp_consensus_slots::Slot;
+use sp_core::{Pair, Public};
+use sp_runtime::traits::{DigestItemFor, Header};

 /// BABE verification parameters
 pub(super) struct VerificationParams<'a, B: 'a + BlockT> {
@@ -57,26 +61,24 @@ pub(super) struct VerificationParams<'a, B: 'a + BlockT> {
 /// with each having different validation logic.
 pub(super) fn check_header<B: BlockT + Sized>(
 	params: VerificationParams<B>,
-) -> Result<CheckedHeader<B::Header, VerifiedHeaderInfo<B>>, Error<B>> where
+) -> Result<CheckedHeader<B::Header, VerifiedHeaderInfo<B>>, Error<B>>
+where
 	DigestItemFor<B>: CompatibleDigestItem,
 {
-	let VerificationParams {
-		mut header,
-		pre_digest,
-		slot_now,
-		epoch,
-	} = params;
+	let VerificationParams { mut header, pre_digest, slot_now, epoch } = params;

 	let authorities = &epoch.authorities;
 	let pre_digest = pre_digest.map(Ok).unwrap_or_else(|| find_pre_digest::<B>(&header))?;

 	trace!(target: "babe", "Checking header");
-	let seal = header.digest_mut().pop()
+	let seal = header
+		.digest_mut()
+		.pop()
 		.ok_or_else(|| babe_err(Error::HeaderUnsealed(header.hash())))?;

-	let sig = seal.as_babe_seal().ok_or_else(|| {
-		babe_err(Error::HeaderBadSeal(header.hash()))
-	})?;
+	let sig = seal
+		.as_babe_seal()
+		.ok_or_else(|| babe_err(Error::HeaderBadSeal(header.hash())))?;

 	// the pre-hash of the header doesn't include the seal
 	// and that's what we sign
@@ -84,7 +86,7 @@ pub(super) fn check_header<B: BlockT + Sized>(

 	if pre_digest.slot() > slot_now {
 		header.digest_mut().push(seal);
-		return Ok(CheckedHeader::Deferred(header, pre_digest.slot()));
+		return Ok(CheckedHeader::Deferred(header, pre_digest.slot()))
 	}

 	let author = match authorities.get(pre_digest.authority_index() as usize) {
@@ -100,45 +102,31 @@ pub(super) fn check_header<B: BlockT + Sized>(
 				primary.slot,
 			);

-			check_primary_header::<B>(
-				pre_hash,
-				primary,
-				sig,
-				&epoch,
-				epoch.config.c,
-			)?;
+			check_primary_header::<B>(pre_hash, primary, sig, &epoch, epoch.config.c)?;
 		},
-		PreDigest::SecondaryPlain(secondary) if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() => {
+		PreDigest::SecondaryPlain(secondary)
+			if epoch.config.allowed_slots.is_secondary_plain_slots_allowed() =>
+		{
 			debug!(target: "babe",
 				"Verifying secondary plain block #{} at slot: {}",
 				header.number(),
 				secondary.slot,
 			);

-			check_secondary_plain_header::<B>(
-				pre_hash,
-				secondary,
-				sig,
-				&epoch,
-			)?;
-		},
-		PreDigest::SecondaryVRF(secondary) if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() => {
+			check_secondary_plain_header::<B>(pre_hash, secondary, sig, &epoch)?;
+		}
+		PreDigest::SecondaryVRF(secondary)
+			if epoch.config.allowed_slots.is_secondary_vrf_slots_allowed() =>
+		{
 			debug!(target: "babe",
 				"Verifying secondary VRF block #{} at slot: {}",
 				header.number(),
 				secondary.slot,
 			);

-			check_secondary_vrf_header::<B>(
-				pre_hash,
-				secondary,
-				sig,
-				&epoch,
-			)?;
-		},
-		_ => {
-			return Err(babe_err(Error::SecondarySlotAssignmentsDisabled));
+			check_secondary_vrf_header::<B>(pre_hash, secondary, sig, &epoch)?;
 		}
+		_ => return Err(babe_err(Error::SecondarySlotAssignmentsDisabled)),
 	}

 	let info = VerifiedHeaderInfo {
@@ -170,27 +158,20 @@ fn check_primary_header<B: BlockT + Sized>(

 	if AuthorityPair::verify(&signature, pre_hash, &author) {
 		let (inout, _) = {
-			let transcript = make_transcript(
-				&epoch.randomness,
-				pre_digest.slot,
-				epoch.epoch_index,
-			);
+			let transcript = make_transcript(&epoch.randomness, pre_digest.slot, epoch.epoch_index);

-			schnorrkel::PublicKey::from_bytes(author.as_slice()).and_then(|p| {
-				p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
-			}).map_err(|s| {
-				babe_err(Error::VRFVerificationFailed(s))
-			})?
+			schnorrkel::PublicKey::from_bytes(author.as_slice())
+				.and_then(|p| {
+					p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
+				})
+				.map_err(|s| babe_err(Error::VRFVerificationFailed(s)))?
 		};

-		let threshold = calculate_primary_threshold(
-			c,
-			&epoch.authorities,
-			pre_digest.authority_index as usize,
-		);
+		let threshold =
+			calculate_primary_threshold(c, &epoch.authorities, pre_digest.authority_index as usize);

 		if !check_primary_threshold(&inout, threshold) {
-			return Err(babe_err(Error::VRFVerificationOfBlockFailed(author.clone(), threshold)));
+			return Err(babe_err(Error::VRFVerificationOfBlockFailed(author.clone(), threshold)))
 		}

 		Ok(())
@@ -211,16 +192,14 @@ fn check_secondary_plain_header<B: BlockT>(
 ) -> Result<(), Error<B>> {
 	// check the signature is valid under the expected authority and
 	// chain state.
-	let expected_author = secondary_slot_author(
-		pre_digest.slot,
-		&epoch.authorities,
-		epoch.randomness,
-	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
+	let expected_author =
+		secondary_slot_author(pre_digest.slot, &epoch.authorities, epoch.randomness)
+			.ok_or_else(|| Error::NoSecondaryAuthorExpected)?;

 	let author = &epoch.authorities[pre_digest.authority_index as usize].0;

 	if expected_author != author {
-		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()));
+		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()))
 	}

 	if AuthorityPair::verify(&signature, pre_hash.as_ref(), author) {
@@ -239,30 +218,22 @@ fn check_secondary_vrf_header<B: BlockT>(
 ) -> Result<(), Error<B>> {
 	// check the signature is valid under the expected authority and
 	// chain state.
-	let expected_author = secondary_slot_author(
-		pre_digest.slot,
-		&epoch.authorities,
-		epoch.randomness,
-	).ok_or_else(|| Error::NoSecondaryAuthorExpected)?;
+	let expected_author =
+		secondary_slot_author(pre_digest.slot, &epoch.authorities, epoch.randomness)
+			.ok_or_else(|| Error::NoSecondaryAuthorExpected)?;

 	let author = &epoch.authorities[pre_digest.authority_index as usize].0;

 	if expected_author != author {
-		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()));
+		return Err(Error::InvalidAuthor(expected_author.clone(), author.clone()))
 	}

 	if AuthorityPair::verify(&signature, pre_hash.as_ref(), author) {
-		let transcript = make_transcript(
-			&epoch.randomness,
-			pre_digest.slot,
-			epoch.epoch_index,
-		);
+		let transcript = make_transcript(&epoch.randomness, pre_digest.slot, epoch.epoch_index);

-		schnorrkel::PublicKey::from_bytes(author.as_slice()).and_then(|p| {
-			p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof)
-		}).map_err(|s| {
-			babe_err(Error::VRFVerificationFailed(s))
-		})?;
+		schnorrkel::PublicKey::from_bytes(author.as_slice())
+			.and_then(|p| p.vrf_verify(transcript, &pre_digest.vrf_output, &pre_digest.vrf_proof))
+			.map_err(|s| babe_err(Error::VRFVerificationFailed(s)))?;

 		Ok(())
 	} else {