git.delta.rocks / unique-network / refs/commits / 3db37f4ef63b

difftreelog

fix clippy warnings

Grigoriy Simonov2023-10-12parent: #5f71c37.patch.diff
in: master

12 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10145,6 +10145,7 @@
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -14897,6 +14898,7 @@
  "sp-runtime",
  "sp-session",
  "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -238,7 +238,7 @@
 			vesting: VestingConfig { vesting: vec![] },
 			parachain_info: ParachainInfoConfig {
 				parachain_id: $id.into(),
-				Default::default()
+				..Default::default()
 			},
 			aura: AuraConfig {
 				authorities: $initial_invulnerables
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -399,6 +399,7 @@
 		Some(Subcommand::TryRuntime(cmd)) => {
 			use std::{future::Future, pin::Pin};
 
+			use polkadot_cli::Block;
 			use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 			use try_runtime_cli::block_building_info::timestamp_with_aura_info;
 
modifiednode/cli/src/rpc.rsdiffbeforeafterboth
--- a/node/cli/src/rpc.rs
+++ b/node/cli/src/rpc.rs
@@ -67,7 +67,7 @@
 }
 
 /// Instantiate all Full RPC extensions.
-pub fn create_full<C, P, SC, R, A, B>(
+pub fn create_full<C, P, SC, R, B>(
 	io: &mut RpcModule<()>,
 	deps: FullDeps<C, P, SC>,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync>>
@@ -244,7 +244,7 @@
 			EthFilter::new(
 				client.clone(),
 				eth_backend,
-				graph.clone(),
+				graph,
 				filter_pool,
 				500_usize, // max stored filters
 				max_past_logs,
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -498,7 +498,7 @@
 				select_chain,
 			};
 
-			create_full::<_, _, _, Runtime, RuntimeApi, _>(&mut rpc_handle, full_deps)?;
+			create_full::<_, _, _, Runtime, _>(&mut rpc_handle, full_deps)?;
 
 			let eth_deps = EthDeps {
 				client,
@@ -547,7 +547,7 @@
 		config: parachain_config,
 		keystore: params.keystore_container.keystore(),
 		backend: backend.clone(),
-		network: network.clone(),
+		network,
 		sync_service: sync_service.clone(),
 		system_rpc_tx,
 		telemetry: telemetry.as_mut(),
@@ -600,19 +600,21 @@
 	if validator {
 		start_consensus(
 			client.clone(),
-			backend.clone(),
-			prometheus_registry.as_ref(),
-			telemetry.as_ref().map(|t| t.handle()),
-			&task_manager,
-			relay_chain_interface.clone(),
 			transaction_pool,
-			sync_service.clone(),
-			params.keystore_container.keystore(),
-			overseer_handle,
-			relay_chain_slot_duration,
-			para_id,
-			collator_key.expect("cli args do not allow this"),
-			announce_block,
+			StartConsensusParameters {
+				backend: backend.clone(),
+				prometheus_registry: prometheus_registry.as_ref(),
+				telemetry: telemetry.as_ref().map(|t| t.handle()),
+				task_manager: &task_manager,
+				relay_chain_interface: relay_chain_interface.clone(),
+				sync_oracle: sync_service,
+				keystore: params.keystore_container.keystore(),
+				overseer_handle,
+				relay_chain_slot_duration,
+				para_id,
+				collator_key: collator_key.expect("cli args do not allow this"),
+				announce_block,
+			}
 		)?;
 	}
 
@@ -670,16 +672,12 @@
 	.map_err(Into::into)
 }
 
-pub fn start_consensus<ExecutorDispatch, RuntimeApi, Runtime>(
-	client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,
+pub struct StartConsensusParameters<'a> {
 	backend: Arc<FullBackend>,
-	prometheus_registry: Option<&Registry>,
+	prometheus_registry: Option<&'a Registry>,
 	telemetry: Option<TelemetryHandle>,
-	task_manager: &TaskManager,
+	task_manager: &'a TaskManager,
 	relay_chain_interface: Arc<dyn RelayChainInterface>,
-	transaction_pool: Arc<
-		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
-	>,
 	sync_oracle: Arc<SyncingService<Block>>,
 	keystore: KeystorePtr,
 	overseer_handle: OverseerHandle,
@@ -687,6 +685,14 @@
 	para_id: ParaId,
 	collator_key: CollatorPair,
 	announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,
+}
+
+pub fn start_consensus<ExecutorDispatch, RuntimeApi, Runtime>(
+	client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,
+	transaction_pool: Arc<
+		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
+	>,
+	parameters: StartConsensusParameters<'_>,
 ) -> Result<(), sc_service::Error>
 where
 	ExecutorDispatch: NativeExecutionDispatch + 'static,
@@ -697,6 +703,20 @@
 	RuntimeApi::RuntimeApi: RuntimeApiDep<Runtime> + 'static,
 	Runtime: RuntimeInstance,
 {
+	let StartConsensusParameters {
+		backend,
+		prometheus_registry,
+		telemetry,
+		task_manager,
+		relay_chain_interface,
+		sync_oracle,
+		keystore,
+		overseer_handle,
+		relay_chain_slot_duration,
+		para_id,
+		collator_key,
+		announce_block,
+	} = parameters;
 	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
 	let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
@@ -704,7 +724,7 @@
 		client.clone(),
 		transaction_pool,
 		prometheus_registry,
-		telemetry.clone(),
+		telemetry,
 	);
 	let proposer = Proposer::new(proposer_factory);
 
@@ -1043,7 +1063,7 @@
 				select_chain,
 			};
 
-			create_full::<_, _, _, Runtime, RuntimeApi, _>(&mut rpc_module, full_deps)?;
+			create_full::<_, _, _, Runtime, _>(&mut rpc_module, full_deps)?;
 
 			let eth_deps = EthDeps {
 				client,
modifiedpallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -161,7 +161,7 @@
 		T::RelayBlockNumberProvider::set_block_number(30_000.into());
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8));
+		_(RawOrigin::Signed(pallet_admin), Some(b as u8));
 
 		Ok(())
 	}
@@ -178,7 +178,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			share * <T as Config>::Currency::total_balance(&caller),
 		);
 
@@ -211,7 +211,7 @@
 			.collect::<Result<Vec<_>, _>>()?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()));
+		_(RawOrigin::Signed(caller));
 
 		Ok(())
 	}
@@ -242,7 +242,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			Into::<BalanceOf<T>>::into(1000u128) * T::Nominal::get(),
 		);
 
@@ -268,7 +268,7 @@
 		let collection = create_nft_collection::<T>(caller)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(pallet_admin.clone()), collection);
+		_(RawOrigin::Signed(pallet_admin), collection);
 
 		Ok(())
 	}
@@ -296,7 +296,7 @@
 		)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(pallet_admin.clone()), collection);
+		_(RawOrigin::Signed(pallet_admin), collection);
 
 		Ok(())
 	}
@@ -319,7 +319,7 @@
 		<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(pallet_admin.clone()), address);
+		_(RawOrigin::Signed(pallet_admin), address);
 
 		Ok(())
 	}
@@ -346,7 +346,7 @@
 		)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(pallet_admin.clone()), address);
+		_(RawOrigin::Signed(pallet_admin), address);
 
 		Ok(())
 	}
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
before · pallets/nonfungible/src/benchmarking.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_benchmarking::v2::{account, benchmarks, BenchmarkError};18use pallet_common::{19	bench_init,20	benchmarking::{create_collection_raw, property_key, property_value},21	CommonCollectionOperations,22};23use sp_std::prelude::*;24use up_data_structs::{25	budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,26	MAX_PROPERTIES_PER_ITEM,27};2829use super::*;30use crate::{Config, NonfungibleHandle, Pallet};3132const SEED: u32 = 1;3334fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {35	CreateItemData::<T> {36		owner,37		properties: Default::default(),38	}39}40fn create_max_item<T: Config>(41	collection: &NonfungibleHandle<T>,42	sender: &T::CrossAccountId,43	owner: T::CrossAccountId,44) -> Result<TokenId, DispatchError> {45	<Pallet<T>>::create_item(46		collection,47		sender,48		create_max_item_data::<T>(owner),49		&Unlimited,50	)?;51	Ok(TokenId(<TokensMinted<T>>::get(collection.id)))52}5354fn create_collection<T: Config>(55	owner: T::CrossAccountId,56) -> Result<NonfungibleHandle<T>, DispatchError> {57	create_collection_raw(58		owner,59		CollectionMode::NFT,60		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),61		NonfungibleHandle::cast,62	)63}6465#[benchmarks]66mod benchmarks {67	use super::*;6869	#[benchmark]70	fn create_item() -> Result<(), BenchmarkError> {71		bench_init! {72			owner: sub; collection: collection(owner);73			sender: cross_from_sub(owner); to: cross_sub;74		};7576		#[block]77		{78			create_max_item(&collection, &sender, to.clone())?;79		}8081		Ok(())82	}8384	#[benchmark]85	fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {86		bench_init! {87			owner: sub; collection: collection(owner);88			sender: cross_from_sub(owner); to: cross_sub;89		};90		let data = (0..b)91			.map(|_| create_max_item_data::<T>(to.clone()))92			.collect();9394		#[block]95		{96			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;97		}9899		Ok(())100	}101102	#[benchmark]103	fn create_multiple_items_ex(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {104		bench_init! {105			owner: sub; collection: collection(owner);106			sender: cross_from_sub(owner);107		};108		let data = (0..b)109			.map(|i| {110				bench_init!(to: cross_sub(i););111				create_max_item_data::<T>(to)112			})113			.collect();114115		#[block]116		{117			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;118		}119120		Ok(())121	}122123	#[benchmark]124	fn burn_item() -> Result<(), BenchmarkError> {125		bench_init! {126			owner: sub; collection: collection(owner);127			sender: cross_from_sub(owner); burner: cross_sub;128		};129		let item = create_max_item(&collection, &sender, burner.clone())?;130131		#[block]132		{133			<Pallet<T>>::burn(&collection, &burner, item)?;134		}135136		Ok(())137	}138139	#[benchmark]140	fn burn_recursively_self_raw() -> Result<(), BenchmarkError> {141		bench_init! {142			owner: sub; collection: collection(owner);143			sender: cross_from_sub(owner); burner: cross_sub;144		};145		let item = create_max_item(&collection, &sender, burner.clone())?;146147		#[block]148		{149			<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?;150		}151152		Ok(())153	}154155	#[benchmark]156	fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(157		b: Linear<0, 200>,158	) -> Result<(), BenchmarkError> {159		bench_init! {160			owner: sub; collection: collection(owner);161			sender: cross_from_sub(owner); burner: cross_sub;162		};163		let item = create_max_item(&collection, &sender, burner.clone())?;164		for _ in 0..b {165			create_max_item(166				&collection,167				&sender,168				T::CrossTokenAddressMapping::token_to_address(collection.id, item),169			)?;170		}171172		#[block]173		{174			<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?;175		}176177		Ok(())178	}179180	#[benchmark]181	fn transfer_raw() -> Result<(), BenchmarkError> {182		bench_init! {183			owner: sub; collection: collection(owner);184			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;185		};186		let item = create_max_item(&collection, &owner, sender.clone())?;187188		#[block]189		{190			<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?;191		}192193		Ok(())194	}195196	#[benchmark]197	fn approve() -> Result<(), BenchmarkError> {198		bench_init! {199			owner: sub; collection: collection(owner);200			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;201		};202		let item = create_max_item(&collection, &owner, sender.clone())?;203204		#[block]205		{206			<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;207		}208209		Ok(())210	}211212	#[benchmark]213	fn approve_from() -> Result<(), BenchmarkError> {214		bench_init! {215			owner: sub; collection: collection(owner);216			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;217		};218		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());219		let item = create_max_item(&collection, &owner, owner_eth.clone())?;220221		#[block]222		{223			<Pallet<T>>::set_allowance_from(224				&collection,225				&sender,226				&owner_eth,227				item,228				Some(&spender),229			)?;230		}231232		Ok(())233	}234235	#[benchmark]236	fn check_allowed_raw() -> Result<(), BenchmarkError> {237		bench_init! {238			owner: sub; collection: collection(owner);239			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;240		};241		let item = create_max_item(&collection, &owner, sender.clone())?;242		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;243244		#[block]245		{246			<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?;247		}248249		Ok(())250	}251252	#[benchmark]253	fn burn_from() -> Result<(), BenchmarkError> {254		bench_init! {255			owner: sub; collection: collection(owner);256			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;257		};258		let item = create_max_item(&collection, &owner, sender.clone())?;259		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;260261		#[block]262		{263			<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?;264		}265266		Ok(())267	}268269	#[benchmark]270	fn set_token_property_permissions(271		b: Linear<0, MAX_PROPERTIES_PER_ITEM>,272	) -> Result<(), BenchmarkError> {273		bench_init! {274			owner: sub; collection: collection(owner);275			owner: cross_from_sub;276		};277		let perms = (0..b)278			.map(|k| PropertyKeyPermission {279				key: property_key(k as usize),280				permission: PropertyPermission {281					mutable: false,282					collection_admin: false,283					token_owner: false,284				},285			})286			.collect::<Vec<_>>();287288		#[block]289		{290			<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;291		}292293		Ok(())294	}295296	#[benchmark]297	fn set_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {298		bench_init! {299			owner: sub; collection: collection(owner);300			owner: cross_from_sub;301		};302		let perms = (0..b)303			.map(|k| PropertyKeyPermission {304				key: property_key(k as usize),305				permission: PropertyPermission {306					mutable: false,307					collection_admin: true,308					token_owner: true,309				},310			})311			.collect::<Vec<_>>();312		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;313		let props = (0..b)314			.map(|k| Property {315				key: property_key(k as usize),316				value: property_value(),317			})318			.collect::<Vec<_>>();319		let item = create_max_item(&collection, &owner, owner.clone())?;320321		#[block]322		{323			<Pallet<T>>::set_token_properties(324				&collection,325				&owner,326				item,327				props.into_iter(),328				&Unlimited,329			)?;330		}331332		Ok(())333	}334335	// TODO:336	#[benchmark]337	fn init_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {338		// bench_init! {339		// 	owner: sub; collection: collection(owner);340		// 	owner: cross_from_sub;341		// };342343		// let perms = (0..b)344		// 	.map(|k| PropertyKeyPermission {345		// 		key: property_key(k as usize),346		// 		permission: PropertyPermission {347		// 			mutable: false,348		// 			collection_admin: true,349		// 			token_owner: true,350		// 		},351		// 	})352		// 	.collect::<Vec<_>>();353		// <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;354		#[block]355		{}356		// let props = (0..b)357		// 	.map(|k| Property {358		// 		key: property_key(k as usize),359		// 		value: property_value(),360		// 	})361		// 	.collect::<Vec<_>>();362		// let item = create_max_item(&collection, &owner, owner.clone())?;363364		// let (is_collection_admin, property_permissions) =365		// 	load_is_admin_and_property_permissions(&collection, &owner);366		// #[block]367		// {368		// 	let mut property_writer =369		// 		pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);370371		// 	property_writer.write_token_properties(372		// 		item,373		// 		props.into_iter(),374		// 		crate::erc::ERC721TokenEvent::TokenChanged {375		// 			token_id: item.into(),376		// 		}377		// 		.to_log(T::ContractAddress::get()),378		// 	)?;379		// }380381		Ok(())382	}383384	#[benchmark]385	fn delete_token_properties(386		b: Linear<0, MAX_PROPERTIES_PER_ITEM>,387	) -> Result<(), BenchmarkError> {388		bench_init! {389			owner: sub; collection: collection(owner);390			owner: cross_from_sub;391		};392		let perms = (0..b)393			.map(|k| PropertyKeyPermission {394				key: property_key(k as usize),395				permission: PropertyPermission {396					mutable: true,397					collection_admin: true,398					token_owner: true,399				},400			})401			.collect::<Vec<_>>();402		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;403		let props = (0..b)404			.map(|k| Property {405				key: property_key(k as usize),406				value: property_value(),407			})408			.collect::<Vec<_>>();409		let item = create_max_item(&collection, &owner, owner.clone())?;410		<Pallet<T>>::set_token_properties(411			&collection,412			&owner,413			item,414			props.into_iter(),415			&Unlimited,416		)?;417		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();418419		#[block]420		{421			<Pallet<T>>::delete_token_properties(422				&collection,423				&owner,424				item,425				to_delete.into_iter(),426				&Unlimited,427			)?;428		}429430		Ok(())431	}432433	#[benchmark]434	fn token_owner() -> Result<(), BenchmarkError> {435		bench_init! {436			owner: sub; collection: collection(owner);437			owner: cross_from_sub;438		};439		let item = create_max_item(&collection, &owner, owner.clone())?;440441		#[block]442		{443			collection.token_owner(item).unwrap();444		}445446		Ok(())447	}448449	#[benchmark]450	fn set_allowance_for_all() -> Result<(), BenchmarkError> {451		bench_init! {452			owner: sub; collection: collection(owner); owner: cross_from_sub;453			operator: cross_sub;454		};455456		#[block]457		{458			<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;459		}460461		Ok(())462	}463464	#[benchmark]465	fn allowance_for_all() -> Result<(), BenchmarkError> {466		bench_init! {467			owner: sub; collection: collection(owner); owner: cross_from_sub;468			operator: cross_sub;469		};470471		#[block]472		{473			<Pallet<T>>::allowance_for_all(&collection, &owner, &operator);474		}475476		Ok(())477	}478479	#[benchmark]480	fn repair_item() -> Result<(), BenchmarkError> {481		bench_init! {482			owner: sub; collection: collection(owner);483			owner: cross_from_sub;484		};485		let item = create_max_item(&collection, &owner, owner.clone())?;486487		#[block]488		{489			<Pallet<T>>::repair_item(&collection, item)?;490		}491492		Ok(())493	}494}
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -82,7 +82,7 @@
 
 		#[block]
 		{
-			create_max_item(&collection, &sender, [(to.clone(), 200)])?;
+			create_max_item(&collection, &sender, [(to, 200)])?;
 		}
 
 		Ok(())
modifiedpallets/unique/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -107,7 +107,7 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), collection);
+		_(RawOrigin::Signed(caller), collection);
 
 		Ok(())
 	}
@@ -120,7 +120,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			collection,
 			T::CrossAccountId::from_sub(allowlist_account),
 		);
@@ -141,7 +141,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			collection,
 			T::CrossAccountId::from_sub(allowlist_account),
 		);
@@ -156,7 +156,7 @@
 		let new_owner: T::AccountId = account("admin", 0, SEED);
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), collection, new_owner);
+		_(RawOrigin::Signed(caller), collection, new_owner);
 
 		Ok(())
 	}
@@ -169,7 +169,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			collection,
 			T::CrossAccountId::from_sub(new_admin),
 		);
@@ -190,7 +190,7 @@
 
 		#[extrinsic_call]
 		_(
-			RawOrigin::Signed(caller.clone()),
+			RawOrigin::Signed(caller),
 			collection,
 			T::CrossAccountId::from_sub(new_admin),
 		);
@@ -204,11 +204,7 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 
 		#[extrinsic_call]
-		_(
-			RawOrigin::Signed(caller.clone()),
-			collection,
-			caller.clone(),
-		);
+		_(RawOrigin::Signed(caller), collection, caller.clone());
 
 		Ok(())
 	}
@@ -224,7 +220,7 @@
 		)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), collection);
+		_(RawOrigin::Signed(caller), collection);
 
 		Ok(())
 	}
@@ -241,7 +237,7 @@
 		<Pallet<T>>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), collection)?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), collection);
+		_(RawOrigin::Signed(caller), collection);
 
 		Ok(())
 	}
@@ -252,7 +248,7 @@
 		let collection = create_nft_collection::<T>(caller.clone())?;
 
 		#[extrinsic_call]
-		_(RawOrigin::Signed(caller.clone()), collection, false);
+		_(RawOrigin::Signed(caller), collection, false);
 
 		Ok(())
 	}
@@ -275,7 +271,7 @@
 		};
 
 		#[extrinsic_call]
-		set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl);
+		set_collection_limits(RawOrigin::Signed(caller), collection, cl);
 
 		Ok(())
 	}
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/foreignassets.rs
+++ b/runtime/common/config/xcm/foreignassets.rs
@@ -77,19 +77,18 @@
 		let here_id =
 			ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Here)).unwrap();
 
-		if asset_id.clone() == parent_id {
+		if *asset_id == parent_id {
 			return Some(MultiLocation::parent());
 		}
 
-		if asset_id.clone() == here_id {
+		if *asset_id == here_id {
 			return Some(MultiLocation::new(
 				1,
 				X1(Parachain(ParachainInfo::get().into())),
 			));
 		}
 
-		let fid =
-			<AssetId as TryAsForeign<AssetId, ForeignAssetId>>::try_as_foreign(asset_id.clone())?;
+		let fid = <AssetId as TryAsForeign<AssetId, ForeignAssetId>>::try_as_foreign(*asset_id)?;
 		XcmForeignAssetIdMapping::<Runtime>::get_multi_location(fid)
 	}
 }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -271,6 +271,7 @@
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-std = { workspace = true }
+sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 staging-xcm = { workspace = true }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -274,6 +274,7 @@
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-std = { workspace = true }
+sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 staging-xcm = { workspace = true }