Fix clippy suggestions. (paritytech#179)

* Fix clippy errors.

* Cargo fmt.

* Enable clippy checks.

* Create if does not exist.

* Fix warnings and enable sccache for clippy.

* chmod +x

* Revert and ignore errors.

* Update cancel-workflow-action.

* Fixes.

* Clippy fixes.

* Fix compilation.

* Fix new clippy warnings.

* fmt --all

* Fix the rest.

* fmt --all

* Conditional.

* Bump smallvec.

* Use separate cache dir for clippy to prevent races.

* Remove unused imports in tests

* Remove "useless conversion"

* Move clippy to main worfklow to avoid clashes.

* Fix clippy error.

* Fix remaning clippy errors.

* cargo fmt --all

Co-authored-by: Hernando Castano <[email protected]>

bridges/bin/node/node/src/chain_spec.rs

@@ -19,7 +19,6 @@ use bridge_node_runtime::{
 	SessionKeys, Signature, SudoConfig, SystemConfig, WASM_BINARY,
 };
 use grandpa_primitives::AuthorityId as GrandpaId;
-use sc_service;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};

bridges/bin/node/node/src/service.rs

@@ -188,7 +188,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
 			config: grandpa_config,
 			link: grandpa_link,
 			network: service.network(),
-			inherent_data_providers: inherent_data_providers.clone(),
+			inherent_data_providers,
 			telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry: service.prometheus_registry(),
@@ -218,7 +218,7 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
 				.fetcher()
 				.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
 
-			let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher.clone());
+			let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher);
 			let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
 				builder.config().transaction_pool.clone(),
 				Arc::new(pool_api),

bridges/bin/node/runtime/src/exchange.rs

@@ -193,17 +193,13 @@ pub(crate) fn prepare_ethereum_transaction(
 		payload: recipient_raw.to_vec(),
 	};
 	editor(&mut eth_tx);
-	eth_tx.sign_by(&signer.into(), Some(chain_id))
+	eth_tx.sign_by(&signer, Some(chain_id))
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use hex_literal::hex;
-	use sp_bridge_eth_poa::{
-		signatures::{SecretKey, SignTransaction},
-		UnsignedTransaction,
-	};
 
 	fn ferdie() -> crate::AccountId {
 		hex!("1cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c").into()

bridges/bin/node/runtime/src/kovan.rs

@@ -108,12 +108,11 @@ pub fn genesis_header() -> Header {
 		gas_limit: 6000000.into(),
 		difficulty: 131072.into(),
 		seal: vec![
-			vec![128].into(),
+			vec![128],
 			vec![
 				184, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			]
-			.into(),
+			],
 		],
 	}
 }
@@ -128,9 +127,7 @@ pub struct PruningStrategy;
 
 impl BridgePruningStrategy for PruningStrategy {
 	fn pruning_upper_bound(&mut self, _best_number: u64, best_finalized_number: u64) -> u64 {
-		best_finalized_number
-			.checked_sub(FINALIZED_HEADERS_TO_KEEP)
-			.unwrap_or(0)
+		best_finalized_number.saturating_sub(FINALIZED_HEADERS_TO_KEEP)
 	}
 }
 

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

@@ -19,6 +19,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]
+// Runtime-generated enums
+#![allow(clippy::large_enum_variant)]
+// Runtime-generated DecodeLimit::decode_all_With_depth_limit
+#![allow(clippy::unnecessary_mut_passed)]
 
 // Make the WASM binary available.
 #[cfg(feature = "std")]

bridges/bin/node/runtime/src/rialto.rs

@@ -82,10 +82,10 @@ pub fn genesis_header() -> Header {
 		gas_used: Default::default(),
 		gas_limit: 0x222222.into(),
 		difficulty: 0x20000.into(),
-		seal: vec![vec![0x80].into(), {
+		seal: vec![vec![0x80], {
 			let mut vec = vec![0xb8, 0x41];
 			vec.resize(67, 0);
-			vec.into()
+			vec
 		}],
 	}
 }
@@ -100,9 +100,7 @@ pub struct PruningStrategy;
 
 impl TPruningStrategy for PruningStrategy {
 	fn pruning_upper_bound(&mut self, _best_number: u64, best_finalized_number: u64) -> u64 {
-		best_finalized_number
-			.checked_sub(FINALIZED_HEADERS_TO_KEEP)
-			.unwrap_or(0)
+		best_finalized_number.saturating_sub(FINALIZED_HEADERS_TO_KEEP)
 	}
 }
 

bridges/modules/currency-exchange/src/lib.rs

@@ -132,7 +132,7 @@ decl_module! {
 				match deposit_result {
 					Ok(_) => (),
 					Err(ExchangeError::DepositPartiallyFailed) => (),
-					Err(error) => Err(Error::<T>::from(error))?,
+					Err(error) => return Err(Error::<T>::from(error).into()),
 				}
 				Transfers::<T>::insert(&transfer_id, ())
 			}
@@ -273,12 +273,10 @@ mod tests {
 		type Amount = u64;
 
 		fn deposit_into(_recipient: Self::Recipient, amount: Self::Amount) -> sp_currency_exchange::Result<()> {
-			if amount < MAX_DEPOSIT_AMOUNT * 10 {
-				Ok(())
-			} else if amount == MAX_DEPOSIT_AMOUNT * 10 {
-				Err(ExchangeError::DepositPartiallyFailed)
-			} else {
-				Err(ExchangeError::DepositFailed)
+			match amount {
+				amount if amount < MAX_DEPOSIT_AMOUNT * 10 => Ok(()),
+				amount if amount == MAX_DEPOSIT_AMOUNT * 10 => Err(ExchangeError::DepositPartiallyFailed),
+				_ => Err(ExchangeError::DepositFailed),
 			}
 		}
 	}

bridges/modules/ethereum-contract/builtin/src/lib.rs

@@ -35,7 +35,7 @@ pub enum Error {
 	/// Failed to decode finality proof.
 	FinalityProofDecode(codec::Error),
 	/// Failed to verify justification.
-	JustificationVerify(ClientError),
+	JustificationVerify(Box<ClientError>),
 }
 
 /// Substrate header.
@@ -120,6 +120,7 @@ pub fn verify_substrate_finality_proof(
 		best_set_id,
 		&best_set,
 	)
+	.map_err(Box::new)
 	.map_err(Error::JustificationVerify)
 	.map(|_| ())
 }
@@ -246,17 +247,16 @@ mod tests {
 	/// Number of the example block with justification.
 	const EXAMPLE_JUSTIFIED_BLOCK_NUMBER: u32 = 8;
 	/// Hash of the example block with justification.
-	const EXAMPLE_JUSTIFIED_BLOCK_HASH: &'static str =
-		"a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f343775";
+	const EXAMPLE_JUSTIFIED_BLOCK_HASH: &str = "a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f343775";
 	/// Id of authorities set that have generated example justification. Could be computed by tracking
 	/// every set change in canonized headers.
 	const EXAMPLE_AUTHORITIES_SET_ID: u64 = 0;
 	/// Encoded authorities set that has generated example justification. Could be fetched from `ScheduledChange`
 	/// digest of the block that has scheduled this set OR by calling `GrandpaApi::grandpa_authorities()` at
 	/// appropriate block.
-	const EXAMPLE_AUTHORITIES_SET: &'static str = "1488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0100000000000000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae690100000000000000439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234f01000000000000005e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d901000000000000001dfe3e22cc0d45c70779c1095f7489a8ef3cf52d62fbd8c2fa38c9f1723502b50100000000000000";
+	const EXAMPLE_AUTHORITIES_SET: &str = "1488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0100000000000000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae690100000000000000439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234f01000000000000005e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d901000000000000001dfe3e22cc0d45c70779c1095f7489a8ef3cf52d62fbd8c2fa38c9f1723502b50100000000000000";
 	/// Example justification. Could be fetched by calling 'chain_getBlock' RPC.
-	const EXAMPLE_JUSTIFICATION: &'static str = "2600000000000000a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f3437750800000010a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000d66b4ceb57ef8bcbc955071b597c8c5d2adcfdbb009c73f8438d342670fdeca9ac60686cbd58105b10f51d0a64a8e73b2e5829b2eab3248a008c472852130b00439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234fa2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000f5730c14d3cd22b7661e2f5fcb3139dd5fef37f946314a441d01b40ce1200ef70d810525f23fd278b588cd67473c200bda83c338c407b479386aa83798e5970b5e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d9a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000c78d6ec463f476461a695b4791d30e7626d16fdf72d7c252c2cad387495a97e8c2827ed4d5af853d6e05d31cb6fb7438c9481a7e9c6990d60a9bfaf6a6e1930988dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eea2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f3437750800000052b4fc52d430286b3e2d650aa6e01b6ff4fae8b968893a62be789209eb97ee6e23780d3f5af7042d85bb48f1b202890b22724dfebce138826f66a5e00324320fd17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae6900";
+	const EXAMPLE_JUSTIFICATION: &str = "2600000000000000a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f3437750800000010a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000d66b4ceb57ef8bcbc955071b597c8c5d2adcfdbb009c73f8438d342670fdeca9ac60686cbd58105b10f51d0a64a8e73b2e5829b2eab3248a008c472852130b00439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234fa2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000f5730c14d3cd22b7661e2f5fcb3139dd5fef37f946314a441d01b40ce1200ef70d810525f23fd278b588cd67473c200bda83c338c407b479386aa83798e5970b5e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d9a2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f34377508000000c78d6ec463f476461a695b4791d30e7626d16fdf72d7c252c2cad387495a97e8c2827ed4d5af853d6e05d31cb6fb7438c9481a7e9c6990d60a9bfaf6a6e1930988dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eea2f45892db86b2ad133ce57d81b7e4375bb7035ce9883e6b68c358164f3437750800000052b4fc52d430286b3e2d650aa6e01b6ff4fae8b968893a62be789209eb97ee6e23780d3f5af7042d85bb48f1b202890b22724dfebce138826f66a5e00324320fd17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae6900";
 
 	#[test]
 	fn substrate_header_parse_fails() {

bridges/modules/ethereum/src/finality.rs

@@ -99,7 +99,7 @@ pub fn finalize_blocks<S: Storage>(
 					*hash == header_validators.0.hash || *hash == best_finalized.hash
 				})
 			})
-			.unwrap_or_else(|| CachedFinalityVotes::default()),
+			.unwrap_or_default(),
 		best_finalized,
 		&validators,
 		id,
@@ -247,7 +247,7 @@ fn empty_steps_signers(header: &Header) -> BTreeSet<Address> {
 	header
 		.empty_steps()
 		.into_iter()
-		.flat_map(|steps| steps)
+		.flatten()
 		.filter_map(|step| empty_step_signer(&step, &header.parent_hash))
 		.collect::<BTreeSet<_>>()
 }
@@ -462,13 +462,9 @@ mod tests {
 			// when we're inserting header#7 and last finalized header is 0:
 			// check that votes at #7 are computed correctly without cache
 			let expected_votes_at_7 = FinalityVotes {
-				votes: vec![
-					(ctx.addresses[0].clone(), 3),
-					(ctx.addresses[1].clone(), 3),
-					(ctx.addresses[2].clone(), 1),
-				]
-				.into_iter()
-				.collect(),
+				votes: vec![(ctx.addresses[0], 3), (ctx.addresses[1], 3), (ctx.addresses[2], 1)]
+					.into_iter()
+					.collect(),
 				ancestry: ancestry[..7].iter().cloned().collect(),
 			};
 			let id7 = headers[6].compute_id();
@@ -491,9 +487,7 @@ mod tests {
 
 			// cached votes at #5
 			let expected_votes_at_5 = FinalityVotes {
-				votes: vec![(ctx.addresses[0].clone(), 3), (ctx.addresses[1].clone(), 2)]
-					.into_iter()
-					.collect(),
+				votes: vec![(ctx.addresses[0], 3), (ctx.addresses[1], 2)].into_iter().collect(),
 				ancestry: ancestry[..5].iter().cloned().collect(),
 			};
 			FinalityCache::<TestRuntime>::insert(hashes[4], expected_votes_at_5);
@@ -520,9 +514,7 @@ mod tests {
 			// when we're inserting header#7 and last finalized header is 3:
 			// check that votes at #7 are computed correctly with cache
 			let expected_votes_at_7 = FinalityVotes {
-				votes: vec![(ctx.addresses[1].clone(), 3), (ctx.addresses[2].clone(), 1)]
-					.into_iter()
-					.collect(),
+				votes: vec![(ctx.addresses[1], 3), (ctx.addresses[2], 1)].into_iter().collect(),
 				ancestry: ancestry[3..7].iter().cloned().collect(),
 			};
 			assert_eq!(

bridges/modules/ethereum/src/import.rs

@@ -70,6 +70,9 @@ pub fn import_headers<S: Storage, PS: PruningStrategy>(
 	Ok((useful, useless))
 }
 
+/// A vector of finalized headers and their submitters.
+pub type FinalizedHeaders<S> = Vec<(HeaderId, Option<<S as Storage>::Submitter>)>;
+
 /// Imports given header and updates blocks finality (if required).
 ///
 /// Transactions receipts must be provided if `header_import_requires_receipts()`
@@ -84,7 +87,7 @@ pub fn import_header<S: Storage, PS: PruningStrategy>(
 	submitter: Option<S::Submitter>,
 	header: Header,
 	receipts: Option<Vec<Receipt>>,
-) -> Result<(HeaderId, Vec<(HeaderId, Option<S::Submitter>)>), Error> {
+) -> Result<(HeaderId, FinalizedHeaders<S>), Error> {
 	// first check that we are able to import this header at all
 	let (header_id, finalized_id) = is_importable_header(storage, &header)?;