Fix clippy lints behind feature gates

bridges/modules/relayers/src/benchmarking.rs

@@ -104,7 +104,7 @@ benchmarks! {
 		// create slash destination account
 		let lane = LaneId([0, 0, 0, 0]);
 		let slash_destination = RewardsAccountParams::new(lane, *b"test", RewardsAccountOwner::ThisChain);
-		T::prepare_rewards_account(slash_destination.clone(), Zero::zero());
+		T::prepare_rewards_account(slash_destination, Zero::zero());
 	}: {
 		crate::Pallet::<T>::slash_and_deregister(&relayer, slash_destination)
 	}
@@ -121,7 +121,7 @@ benchmarks! {
 		let account_params =
 			RewardsAccountParams::new(lane, *b"test", RewardsAccountOwner::ThisChain);
 	}: {
-		crate::Pallet::<T>::register_relayer_reward(account_params.clone(), &relayer, One::one());
+		crate::Pallet::<T>::register_relayer_reward(account_params, &relayer, One::one());
 	}
 	verify {
 		assert_eq!(RelayerRewards::<T>::get(relayer, &account_params), Some(One::one()));

cumulus/parachains/pallets/collective-content/src/benchmarking.rs

@@ -56,7 +56,7 @@ mod benchmarks {
 			.map_err(|_| BenchmarkError::Weightless)?;
 
 		#[extrinsic_call]
-		_(origin as T::RuntimeOrigin, cid.clone(), Some(expire_at.clone()));
+		_(origin as T::RuntimeOrigin, cid.clone(), Some(expire_at));
 
 		assert_eq!(<Announcements<T, I>>::count(), 1);
 		assert_last_event::<T, I>(

polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs

@@ -175,7 +175,7 @@ benchmarks! {
 	descend_origin {
 		let mut executor = new_executor::<T>(Default::default());
 		let who = X2(OnlyChild, OnlyChild);
-		let instruction = Instruction::DescendOrigin(who.clone());
+		let instruction = Instruction::DescendOrigin(who);
 		let xcm = Xcm(vec![instruction]);
 	} : {
 		executor.bench_process(xcm)?;
@@ -242,7 +242,7 @@ benchmarks! {
 			&origin,
 			assets.clone().into(),
 			&XcmContext {
-				origin: Some(origin.clone()),
+				origin: Some(origin),
 				message_id: [0; 32],
 				topic: None,
 			},
@@ -279,7 +279,7 @@ benchmarks! {
 		let origin = T::subscribe_origin()?;
 		let query_id = Default::default();
 		let max_response_weight = Default::default();
-		let mut executor = new_executor::<T>(origin.clone());
+		let mut executor = new_executor::<T>(origin);
 		let instruction = Instruction::SubscribeVersion { query_id, max_response_weight };
 		let xcm = Xcm(vec![instruction]);
 	} : {
@@ -299,14 +299,14 @@ benchmarks! {
 			query_id,
 			max_response_weight,
 			&XcmContext {
-				origin: Some(origin.clone()),
+				origin: Some(origin),
 				message_id: [0; 32],
 				topic: None,
 			},
 		).map_err(|_| "Could not start subscription")?;
 		assert!(<T::XcmConfig as xcm_executor::Config>::SubscriptionService::is_subscribed(&origin));
 
-		let mut executor = new_executor::<T>(origin.clone());
+		let mut executor = new_executor::<T>(origin);
 		let instruction = Instruction::UnsubscribeVersion;
 		let xcm = Xcm(vec![instruction]);
 	} : {
@@ -538,7 +538,7 @@ benchmarks! {
 
 		let mut executor = new_executor::<T>(origin);
 
-		let instruction = Instruction::UniversalOrigin(alias.clone());
+		let instruction = Instruction::UniversalOrigin(alias);
 		let xcm = Xcm(vec![instruction]);
 	}: {
 		executor.bench_process(xcm)?;
@@ -632,13 +632,13 @@ benchmarks! {
 
 		let (unlocker, owner, asset) = T::unlockable_asset()?;
 
-		let mut executor = new_executor::<T>(unlocker.clone());
+		let mut executor = new_executor::<T>(unlocker);
 
 		// We first place the asset in lock first...
 		<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
 			unlocker,
 			asset.clone(),
-			owner.clone(),
+			owner,
 		)
 		.map_err(|_| BenchmarkError::Skip)?
 		.enact()
@@ -658,13 +658,13 @@ benchmarks! {
 
 		let (unlocker, owner, asset) = T::unlockable_asset()?;
 
-		let mut executor = new_executor::<T>(unlocker.clone());
+		let mut executor = new_executor::<T>(unlocker);
 
 		// We first place the asset in lock first...
 		<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
 			unlocker,
 			asset.clone(),
-			owner.clone(),
+			owner,
 		)
 		.map_err(|_| BenchmarkError::Skip)?
 		.enact()
@@ -686,9 +686,9 @@ benchmarks! {
 
 		// We first place the asset in lock first...
 		<T::XcmConfig as xcm_executor::Config>::AssetLocker::prepare_lock(
-			locker.clone(),
+			locker,
 			asset.clone(),
-			owner.clone(),
+			owner,
 		)
 		.map_err(|_| BenchmarkError::Skip)?
 		.enact()
@@ -739,7 +739,7 @@ benchmarks! {
 
 		let mut executor = new_executor::<T>(origin);
 
-		let instruction = Instruction::AliasOrigin(target.clone());
+		let instruction = Instruction::AliasOrigin(target);
 		let xcm = Xcm(vec![instruction]);
 	}: {
 		executor.bench_process(xcm)?;

substrate/frame/alliance/src/benchmarking.rs

@@ -183,20 +183,15 @@ mod benchmarks {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
-				last_hash.clone(),
+				last_hash,
 				index,
 				true,
 			)?;
 		}
 
 		let voter = members[m as usize - 3].clone();
 		// Voter votes aye without resolving the vote.
-		Alliance::<T, I>::vote(
-			SystemOrigin::Signed(voter.clone()).into(),
-			last_hash.clone(),
-			index,
-			true,
-		)?;
+		Alliance::<T, I>::vote(SystemOrigin::Signed(voter.clone()).into(), last_hash, index, true)?;
 
 		// Voter switches vote to nay, but does not kill the vote, just updates + inserts
 		let approve = false;
@@ -206,7 +201,7 @@ mod benchmarks {
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
 
 		#[extrinsic_call]
-		_(SystemOrigin::Signed(voter), last_hash.clone(), index, approve);
+		_(SystemOrigin::Signed(voter), last_hash, index, approve);
 
 		//nothing to verify
 		Ok(())
@@ -255,24 +250,19 @@ mod benchmarks {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
-				last_hash.clone(),
+				last_hash,
 				index,
 				true,
 			)?;
 		}
 
 		// Voter votes aye without resolving the vote.
-		Alliance::<T, I>::vote(
-			SystemOrigin::Signed(voter.clone()).into(),
-			last_hash.clone(),
-			index,
-			true,
-		)?;
+		Alliance::<T, I>::vote(SystemOrigin::Signed(voter.clone()).into(), last_hash, index, true)?;
 
 		// Voter switches vote to nay, which kills the vote
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(voter.clone()).into(),
-			last_hash.clone(),
+			last_hash,
 			index,
 			false,
 		)?;
@@ -282,7 +272,7 @@ mod benchmarks {
 		frame_benchmarking::benchmarking::add_to_whitelist(voter_key.into());
 
 		#[extrinsic_call]
-		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+		close(SystemOrigin::Signed(voter), last_hash, index, Weight::MAX, bytes_in_storage);
 
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
 		Ok(())
@@ -330,7 +320,7 @@ mod benchmarks {
 		// approval vote
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(proposer.clone()).into(),
-			last_hash.clone(),
+			last_hash,
 			index,
 			false,
 		)?;
@@ -340,7 +330,7 @@ mod benchmarks {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
-				last_hash.clone(),
+				last_hash,
 				index,
 				false,
 			)?;
@@ -349,22 +339,17 @@ mod benchmarks {
 		// Member zero is the first aye
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(members[0].clone()).into(),
-			last_hash.clone(),
+			last_hash,
 			index,
 			true,
 		)?;
 
 		let voter = members[1].clone();
 		// Caller switches vote to aye, which passes the vote
-		Alliance::<T, I>::vote(
-			SystemOrigin::Signed(voter.clone()).into(),
-			last_hash.clone(),
-			index,
-			true,
-		)?;
+		Alliance::<T, I>::vote(SystemOrigin::Signed(voter.clone()).into(), last_hash, index, true)?;
 
 		#[extrinsic_call]
-		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+		close(SystemOrigin::Signed(voter), last_hash, index, Weight::MAX, bytes_in_storage);
 
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
 		Ok(())
@@ -414,23 +399,23 @@ mod benchmarks {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
-				last_hash.clone(),
+				last_hash,
 				index,
 				true,
 			)?;
 		}
 
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(voter.clone()).into(),
-			last_hash.clone(),
+			last_hash,
 			index,
 			false,
 		)?;
 
 		System::<T>::set_block_number(BlockNumberFor::<T>::max_value());
 
 		#[extrinsic_call]
-		close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage);
+		close(SystemOrigin::Signed(voter), last_hash, index, Weight::MAX, bytes_in_storage);
 
 		// The last proposal is removed.
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
@@ -477,7 +462,7 @@ mod benchmarks {
 		// The prime member votes aye, so abstentions default to aye.
 		Alliance::<T, I>::vote(
 			SystemOrigin::Signed(proposer.clone()).into(),
-			last_hash.clone(),
+			last_hash,
 			p - 1,
 			true, // Vote aye.
 		)?;
@@ -489,7 +474,7 @@ mod benchmarks {
 			let voter = &members[j as usize];
 			Alliance::<T, I>::vote(
 				SystemOrigin::Signed(voter.clone()).into(),
-				last_hash.clone(),
+				last_hash,
 				index,
 				false,
 			)?;
@@ -499,13 +484,7 @@ mod benchmarks {
 		System::<T>::set_block_number(BlockNumberFor::<T>::max_value());
 
 		#[extrinsic_call]
-		close(
-			SystemOrigin::Signed(proposer),
-			last_hash.clone(),
-			index,
-			Weight::MAX,
-			bytes_in_storage,
-		);
+		close(SystemOrigin::Signed(proposer), last_hash, index, Weight::MAX, bytes_in_storage);
 
 		assert_eq!(T::ProposalProvider::proposal_of(last_hash), None);
 		Ok(())

substrate/frame/bounties/src/benchmarking.rs

@@ -222,7 +222,7 @@ benchmarks_instance_pallet! {
 		);
 	}
 	verify {
-		ensure!(missed_any == false, "Missed some");
+		ensure!(!missed_any, "Missed some");
 		if b > 0 {
 			ensure!(budget_remaining < BalanceOf::<T, I>::max_value(), "Budget not used");
 			assert_last_event::<T, I>(Event::BountyBecameActive { index: b - 1 }.into())

substrate/frame/contracts/src/benchmarking/mod.rs

@@ -1749,7 +1749,7 @@ benchmarks! {
 			.collect::<Vec<BalanceOf<T>>>();
 		let deposits_bytes: Vec<u8> = deposits.iter().flat_map(|i| i.encode()).collect();
 		let deposits_len = deposits_bytes.len() as u32;
-		let deposit_len = value_len.clone();
+		let deposit_len = value_len;
 		let callee_offset = value_len + deposits_len;
 		let code = WasmModule::<T>::from(ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
@@ -2246,13 +2246,12 @@ benchmarks! {
 		let message_len = message.len() as i32;
 		let key_type = sp_core::crypto::KeyTypeId(*b"code");
 		let sig_params = (0..r)
-			.map(|i| {
+			.flat_map(|i| {
 				let pub_key = sp_io::crypto::sr25519_generate(key_type, None);
 				let sig = sp_io::crypto::sr25519_sign(key_type, &pub_key, &message).expect("Generates signature");
 				let data: [u8; 96] = [AsRef::<[u8]>::as_ref(&sig), AsRef::<[u8]>::as_ref(&pub_key)].concat().try_into().unwrap();
 				data
 			})
-			.flatten()
 			.collect::<Vec<_>>();
 		let sig_params_len = sig_params.len() as i32;
 

substrate/frame/contracts/src/migration/v12.rs

@@ -317,7 +317,7 @@ where
 		let (_, old_deposit, storage_module) = state;
 		// CodeInfoOf::max_encoded_len == OwnerInfoOf::max_encoded_len + 1
 		// I.e. code info adds up 1 byte per record.
-		let info_bytes_added = items.clone();
+		let info_bytes_added = items;
 		// We removed 1 PrefabWasmModule, and added 1 byte of determinism flag, per contract code.
 		let storage_removed = storage_module.saturating_sub(info_bytes_added);
 		// module+code+info - bytes

substrate/frame/democracy/src/benchmarking.rs

@@ -65,7 +65,7 @@ fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, T::Hash, T::Hash) {
 		0u32.into(),
 	);
 	let preimage_hash = note_preimage::<T>();
-	MetadataOf::<T>::insert(crate::MetadataOwner::Referendum(index), preimage_hash.clone());
+	MetadataOf::<T>::insert(crate::MetadataOwner::Referendum(index), preimage_hash);
 	(index, hash, preimage_hash)
 }
 

substrate/frame/fast-unstake/src/benchmarking.rs

@@ -162,7 +162,7 @@ benchmarks! {
 			fast_unstake_events::<T>().last(),
 			Some(Event::BatchChecked { .. })
 		));
-		assert!(stashes.iter().all(|(s, _)| request.stashes.iter().find(|(ss, _)| ss == s).is_some()));
+		assert!(stashes.iter().all(|(s, _)| request.stashes.iter().any(|(ss, _)| ss == s)));
 	}
 
 	register_fast_unstake {