cargo +nightly fmt --all (#1192)

Author: svyatonik

bridges/bin/millau/runtime/src/lib.rs

@@ -65,9 +65,7 @@ pub use frame_support::{
 
 pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
-pub use pallet_bridge_grandpa::{
-	Call as BridgeGrandpaRialtoCall, Call as BridgeGrandpaWestendCall,
-};
+pub use pallet_bridge_grandpa::Call as BridgeGrandpaCall;
 pub use pallet_bridge_messages::Call as MessagesCall;
 pub use pallet_sudo::Call as SudoCall;
 pub use pallet_timestamp::Call as TimestampCall;

bridges/modules/ethereum/src/validators.rs

@@ -132,6 +132,7 @@ impl<'a> Validators<'a> {
 		}
 
 		let receipts = receipts.ok_or(Error::MissingTransactionsReceipts)?;
+		#[allow(clippy::question_mark)]
 		if header.check_receipts_root(&receipts).is_err() {
 			return Err(Error::TransactionsReceiptsMismatch)
 		}

bridges/modules/ethereum/src/verification.rs

@@ -152,6 +152,7 @@ pub fn accept_aura_header_into_pool<S: Storage, CT: ChainTime>(
 	// the heaviest, but rare operation - we do not want invalid receipts in the pool
 	if let Some(receipts) = receipts {
 		log::trace!(target: "runtime", "Got receipts! {:?}", receipts);
+		#[allow(clippy::question_mark)]
 		if header.check_receipts_root(receipts).is_err() {
 			return Err(Error::TransactionsReceiptsMismatch)
 		}

bridges/modules/token-swap/src/lib.rs

@@ -226,6 +226,7 @@ pub mod pallet {
 		/// Violating rule#1 will lead to losing your `source_balance_at_this_chain` tokens.
 		/// Violating other rules will lead to losing message fees for this and other transactions +
 		/// losing fees for message transfer.
+		#[allow(clippy::boxed_local)]
 		#[pallet::weight(
 			T::WeightInfo::create_swap()
 				.saturating_add(T::WeightInfo::send_message_weight(

bridges/relays/bin-substrate/src/chains/mod.rs

@@ -287,10 +287,11 @@ mod rococo_tests {
 			Box::new(header.clone()),
 			justification.clone(),
 		);
-		let expected = millau_runtime::BridgeGrandpaRialtoCall::<millau_runtime::Runtime>::submit_finality_proof(
-			Box::new(header),
-			justification,
-		);
+		let expected =
+			millau_runtime::BridgeGrandpaCall::<millau_runtime::Runtime>::submit_finality_proof(
+				Box::new(header),
+				justification,
+			);
 
 		// when
 		let actual_encoded = actual.encode();
@@ -335,10 +336,11 @@ mod westend_tests {
 			header.clone(),
 			justification.clone(),
 		);
-		let expected = millau_runtime::BridgeGrandpaRialtoCall::<millau_runtime::Runtime>::submit_finality_proof(
-			Box::new(header),
-			justification,
-		);
+		let expected =
+			millau_runtime::BridgeGrandpaCall::<millau_runtime::Runtime>::submit_finality_proof(
+				Box::new(header),
+				justification,
+			);
 
 		// when
 		let actual_encoded = actual.encode();

bridges/relays/bin-substrate/src/chains/rialto_headers_to_millau.rs

@@ -66,7 +66,7 @@ impl SubstrateFinalitySyncPipeline for RialtoFinalityToMillau {
 		header: RialtoSyncHeader,
 		proof: GrandpaJustification<bp_rialto::Header>,
 	) -> Bytes {
-		let call = millau_runtime::BridgeGrandpaRialtoCall::<
+		let call = millau_runtime::BridgeGrandpaCall::<
 			millau_runtime::Runtime,
 			millau_runtime::RialtoGrandpaInstance,
 		>::submit_finality_proof(Box::new(header.into_inner()), proof)

bridges/relays/bin-substrate/src/chains/westend_headers_to_millau.rs

@@ -74,7 +74,7 @@ impl SubstrateFinalitySyncPipeline for WestendFinalityToMillau {
 		header: WestendSyncHeader,
 		proof: GrandpaJustification<bp_westend::Header>,
 	) -> Bytes {
-		let call = millau_runtime::BridgeGrandpaWestendCall::<
+		let call = millau_runtime::BridgeGrandpaCall::<
 			millau_runtime::Runtime,
 			millau_runtime::WestendGrandpaInstance,
 		>::submit_finality_proof(Box::new(header.into_inner()), proof)

bridges/relays/bin-substrate/src/cli/init_bridge.rs

@@ -75,7 +75,7 @@ macro_rules! select_bridge {
 				fn encode_init_bridge(
 					init_data: InitializationData<<Source as ChainBase>::Header>,
 				) -> <Target as Chain>::Call {
-					let initialize_call = millau_runtime::BridgeGrandpaRialtoCall::<
+					let initialize_call = millau_runtime::BridgeGrandpaCall::<
 						millau_runtime::Runtime,
 						millau_runtime::RialtoGrandpaInstance,
 					>::initialize(init_data);
@@ -95,7 +95,7 @@ macro_rules! select_bridge {
 					// our deployments may fail, because we need to initialize both Rialto -> Millau
 					// and Westend -> Millau bridge. => since there's single possible sudo account,
 					// one of transaction may fail with duplicate nonce error
-					millau_runtime::BridgeGrandpaWestendCall::<
+					millau_runtime::BridgeGrandpaCall::<
 						millau_runtime::Runtime,
 						millau_runtime::WestendGrandpaInstance,
 					>::initialize(init_data)

bridges/relays/bin-substrate/src/cli/register_parachain.rs

@@ -112,7 +112,7 @@ impl RegisterParachain {
 
 			// step 1: reserve a parachain id
 			let relay_genesis_hash = *relay_client.genesis_hash();
-			let relay_sudo_account: AccountIdOf<Relaychain> = relay_sign.public().clone().into();
+			let relay_sudo_account: AccountIdOf<Relaychain> = relay_sign.public().into();
 			let reserve_parachain_id_call: CallOf<Relaychain> = ParaRegistrarCall::reserve().into();
 			let reserve_parachain_signer = relay_sign.clone();
 			wait_until_transaction_is_finalized::<Relaychain>(

bridges/relays/bin-substrate/src/cli/resubmit_transactions.rs

@@ -134,9 +134,9 @@ impl ResubmitTransactions {
 							transaction: None,
 							resubmitted: 0,
 							stalled_for: Zero::zero(),
-							stalled_for_limit: self.stalled_blocks.into(),
-							tip_step: self.tip_step.cast().into(),
-							tip_limit: self.tip_limit.cast().into(),
+							stalled_for_limit: self.stalled_blocks as _,
+							tip_step: self.tip_step.cast() as _,
+							tip_limit: self.tip_limit.cast() as _,
 						},
 					)
 				})