difftreelog
fix clippy warnings
in: master
12 files changed
Cargo.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",
node/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
node/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;
node/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,
node/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,
pallets/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(())
}
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -75,7 +75,7 @@
#[block]
{
- create_max_item(&collection, &sender, to.clone())?;
+ create_max_item(&collection, &sender, to)?;
}
Ok(())
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth1// 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 core::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::v2::*;20use pallet_common::{21 bench_init,22 benchmarking::{23 create_collection_raw, /*load_is_admin_and_property_permissions,*/ property_key,24 property_value,25 },26};27use sp_std::prelude::*;28use up_data_structs::{29 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,30 MAX_PROPERTIES_PER_ITEM,31};3233use super::*;34use crate::{Config, Pallet, RefungibleHandle};3536const SEED: u32 = 1;3738fn create_max_item_data<T: Config>(39 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,40) -> CreateItemData<T> {41 CreateItemData::<T> {42 users: users43 .into_iter()44 .collect::<BTreeMap<_, _>>()45 .try_into()46 .unwrap(),47 properties: Default::default(),48 }49}5051fn create_max_item<T: Config>(52 collection: &RefungibleHandle<T>,53 sender: &T::CrossAccountId,54 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,55) -> Result<TokenId, DispatchError> {56 let data: CreateItemData<T> = create_max_item_data::<T>(users);57 <Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;58 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))59}6061fn create_collection<T: Config>(62 owner: T::CrossAccountId,63) -> Result<RefungibleHandle<T>, DispatchError> {64 create_collection_raw(65 owner,66 CollectionMode::ReFungible,67 |owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),68 RefungibleHandle::cast,69 )70}7172#[benchmarks]73mod benchmarks {74 use super::*;7576 #[benchmark]77 fn create_item() -> Result<(), BenchmarkError> {78 bench_init! {79 owner: sub; collection: collection(owner);80 sender: cross_from_sub(owner); to: cross_sub;81 };8283 #[block]84 {85 create_max_item(&collection, &sender, [(to.clone(), 200)])?;86 }8788 Ok(())89 }9091 #[benchmark]92 fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {93 bench_init! {94 owner: sub; collection: collection(owner);95 sender: cross_from_sub(owner); to: cross_sub;96 };97 let data = (0..b)98 .map(|_| create_max_item_data::<T>([(to.clone(), 200)]))99 .collect();100101 #[block]102 {103 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;104 }105106 Ok(())107 }108 #[benchmark]109 fn create_multiple_items_ex_multiple_items(110 b: Linear<0, MAX_ITEMS_PER_BATCH>,111 ) -> Result<(), BenchmarkError> {112 bench_init! {113 owner: sub; collection: collection(owner);114 sender: cross_from_sub(owner);115 };116 let data = (0..b)117 .map(|t| {118 bench_init!(to: cross_sub(t););119 create_max_item_data::<T>([(to, 200)])120 })121 .collect();122123 #[block]124 {125 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;126 }127128 Ok(())129 }130131 #[benchmark]132 fn create_multiple_items_ex_multiple_owners(133 b: Linear<0, MAX_ITEMS_PER_BATCH>,134 ) -> Result<(), BenchmarkError> {135 bench_init! {136 owner: sub; collection: collection(owner);137 sender: cross_from_sub(owner);138 };139 let data = vec![create_max_item_data::<T>((0..b).map(|u| {140 bench_init!(to: cross_sub(u););141 (to, 200)142 }))];143144 #[block]145 {146 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;147 }148149 Ok(())150 }151152 // Other user left, token data is kept153 #[benchmark]154 fn burn_item_partial() -> Result<(), BenchmarkError> {155 bench_init! {156 owner: sub; collection: collection(owner);157 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;158 };159 let item = create_max_item(160 &collection,161 &sender,162 [(burner.clone(), 200), (another_owner, 200)],163 )?;164165 #[block]166 {167 <Pallet<T>>::burn(&collection, &burner, item, 200)?;168 }169170 Ok(())171 }172173 // No users remaining, token is destroyed174 #[benchmark]175 fn burn_item_fully() -> Result<(), BenchmarkError> {176 bench_init! {177 owner: sub; collection: collection(owner);178 sender: cross_from_sub(owner); burner: cross_sub;179 };180 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;181182 #[block]183 {184 <Pallet<T>>::burn(&collection, &burner, item, 200)?;185 }186187 Ok(())188 }189190 #[benchmark]191 fn transfer_normal() -> Result<(), BenchmarkError> {192 bench_init! {193 owner: sub; collection: collection(owner);194 sender: cross_from_sub(owner); receiver: cross_sub;195 };196 let item = create_max_item(197 &collection,198 &sender,199 [(sender.clone(), 200), (receiver.clone(), 200)],200 )?;201202 #[block]203 {204 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;205 }206207 Ok(())208 }209210 // Target account is created211 #[benchmark]212 fn transfer_creating() -> Result<(), BenchmarkError> {213 bench_init! {214 owner: sub; collection: collection(owner);215 sender: cross_from_sub(owner); receiver: cross_sub;216 };217 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;218219 #[block]220 {221 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;222 }223224 Ok(())225 }226227 // Source account is destroyed228 #[benchmark]229 fn transfer_removing() -> Result<(), BenchmarkError> {230 bench_init! {231 owner: sub; collection: collection(owner);232 sender: cross_from_sub(owner); receiver: cross_sub;233 };234 let item = create_max_item(235 &collection,236 &sender,237 [(sender.clone(), 200), (receiver.clone(), 200)],238 )?;239240 #[block]241 {242 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;243 }244245 Ok(())246 }247248 // Source account destroyed, target created249 #[benchmark]250 fn transfer_creating_removing() -> Result<(), BenchmarkError> {251 bench_init! {252 owner: sub; collection: collection(owner);253 sender: cross_from_sub(owner); receiver: cross_sub;254 };255 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;256257 #[block]258 {259 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;260 }261262 Ok(())263 }264265 #[benchmark]266 fn approve() -> Result<(), BenchmarkError> {267 bench_init! {268 owner: sub; collection: collection(owner);269 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;270 };271 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;272273 #[block]274 {275 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;276 }277278 Ok(())279 }280281 #[benchmark]282 fn approve_from() -> Result<(), BenchmarkError> {283 bench_init! {284 owner: sub; collection: collection(owner);285 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;286 };287 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());288 let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;289290 #[block]291 {292 <Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?;293 }294295 Ok(())296 }297298 #[benchmark]299 fn transfer_from_normal() -> Result<(), BenchmarkError> {300 bench_init! {301 owner: sub; collection: collection(owner);302 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;303 };304 let item = create_max_item(305 &collection,306 &owner,307 [(sender.clone(), 200), (receiver.clone(), 200)],308 )?;309 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;310311 #[block]312 {313 <Pallet<T>>::transfer_from(314 &collection,315 &spender,316 &sender,317 &receiver,318 item,319 100,320 &Unlimited,321 )?;322 }323324 Ok(())325 }326327 // Target account is created328 #[benchmark]329 fn transfer_from_creating() -> Result<(), BenchmarkError> {330 bench_init! {331 owner: sub; collection: collection(owner);332 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;333 };334 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;335 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;336337 #[block]338 {339 <Pallet<T>>::transfer_from(340 &collection,341 &spender,342 &sender,343 &receiver,344 item,345 100,346 &Unlimited,347 )?;348 }349350 Ok(())351 }352353 // Source account is destroyed354 #[benchmark]355 fn transfer_from_removing() -> Result<(), BenchmarkError> {356 bench_init! {357 owner: sub; collection: collection(owner);358 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;359 };360 let item = create_max_item(361 &collection,362 &owner,363 [(sender.clone(), 200), (receiver.clone(), 200)],364 )?;365 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;366367 #[block]368 {369 <Pallet<T>>::transfer_from(370 &collection,371 &spender,372 &sender,373 &receiver,374 item,375 200,376 &Unlimited,377 )?;378 }379380 Ok(())381 }382383 // Source account destroyed, target created384 #[benchmark]385 fn transfer_from_creating_removing() -> Result<(), BenchmarkError> {386 bench_init! {387 owner: sub; collection: collection(owner);388 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;389 };390 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;391 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;392393 #[block]394 {395 <Pallet<T>>::transfer_from(396 &collection,397 &spender,398 &sender,399 &receiver,400 item,401 200,402 &Unlimited,403 )?;404 }405406 Ok(())407 }408409 // Both source account and token is destroyed410 #[benchmark]411 fn burn_from() -> Result<(), BenchmarkError> {412 bench_init! {413 owner: sub; collection: collection(owner);414 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;415 };416 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;417 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;418419 #[block]420 {421 <Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?;422 }423424 Ok(())425 }426427 #[benchmark]428 fn set_token_property_permissions(429 b: Linear<0, MAX_PROPERTIES_PER_ITEM>,430 ) -> Result<(), BenchmarkError> {431 bench_init! {432 owner: sub; collection: collection(owner);433 owner: cross_from_sub;434 };435 let perms = (0..b)436 .map(|k| PropertyKeyPermission {437 key: property_key(k as usize),438 permission: PropertyPermission {439 mutable: false,440 collection_admin: false,441 token_owner: false,442 },443 })444 .collect::<Vec<_>>();445446 #[block]447 {448 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;449 }450451 Ok(())452 }453454 #[benchmark]455 fn set_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {456 bench_init! {457 owner: sub; collection: collection(owner);458 owner: cross_from_sub;459 };460 let perms = (0..b)461 .map(|k| PropertyKeyPermission {462 key: property_key(k as usize),463 permission: PropertyPermission {464 mutable: false,465 collection_admin: true,466 token_owner: true,467 },468 })469 .collect::<Vec<_>>();470 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;471 let props = (0..b)472 .map(|k| Property {473 key: property_key(k as usize),474 value: property_value(),475 })476 .collect::<Vec<_>>();477 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;478479 #[block]480 {481 <Pallet<T>>::set_token_properties(482 &collection,483 &owner,484 item,485 props.into_iter(),486 &Unlimited,487 )?;488 }489490 Ok(())491 }492493 // TODO:494 #[benchmark]495 fn init_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {496 // bench_init! {497 // owner: sub; collection: collection(owner);498 // owner: cross_from_sub;499 // };500501 // let perms = (0..b)502 // .map(|k| PropertyKeyPermission {503 // key: property_key(k as usize),504 // permission: PropertyPermission {505 // mutable: false,506 // collection_admin: true,507 // token_owner: true,508 // },509 // })510 // .collect::<Vec<_>>();511 // <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;512513 #[block]514 {}515 // let props = (0..b).map(|k| Property {516 // key: property_key(k as usize),517 // value: property_value(),518 // }).collect::<Vec<_>>();519 // let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;520521 // let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner)522 // let mut property_writer = pallet_common::collection_info_loaded_property_writer(523 // &collection,524 // is_collection_admin,525 // property_permissions,526 // );527528 // #[block]529 // {530 // property_writer.write_token_properties(531 // true,532 // item,533 // props.into_iter(),534 // crate::erc::ERC721TokenEvent::TokenChanged {535 // token_id: item.into(),536 // }537 // .to_log(T::ContractAddress::get()),538 // )?;539 // }540541 Ok(())542 }543544 #[benchmark]545 fn delete_token_properties(546 b: Linear<0, MAX_PROPERTIES_PER_ITEM>,547 ) -> Result<(), BenchmarkError> {548 bench_init! {549 owner: sub; collection: collection(owner);550 owner: cross_from_sub;551 };552 let perms = (0..b)553 .map(|k| PropertyKeyPermission {554 key: property_key(k as usize),555 permission: PropertyPermission {556 mutable: true,557 collection_admin: true,558 token_owner: true,559 },560 })561 .collect::<Vec<_>>();562 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;563 let props = (0..b)564 .map(|k| Property {565 key: property_key(k as usize),566 value: property_value(),567 })568 .collect::<Vec<_>>();569 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;570 <Pallet<T>>::set_token_properties(571 &collection,572 &owner,573 item,574 props.into_iter(),575 &Unlimited,576 )?;577 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();578579 #[block]580 {581 <Pallet<T>>::delete_token_properties(582 &collection,583 &owner,584 item,585 to_delete.into_iter(),586 &Unlimited,587 )?;588 }589590 Ok(())591 }592593 #[benchmark]594 fn repartition_item() -> Result<(), BenchmarkError> {595 bench_init! {596 owner: sub; collection: collection(owner);597 sender: cross_from_sub(owner); owner: cross_sub;598 };599 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;600601 #[block]602 {603 <Pallet<T>>::repartition(&collection, &owner, item, 200)?;604 }605606 Ok(())607 }608609 #[benchmark]610 fn token_owner() -> Result<(), BenchmarkError> {611 bench_init! {612 owner: sub; collection: collection(owner);613 sender: cross_from_sub(owner); owner: cross_sub;614 };615 let item = create_max_item(&collection, &sender, [(owner, 100)])?;616617 #[block]618 {619 <Pallet<T>>::token_owner(collection.id, item).unwrap();620 }621622 Ok(())623 }624625 #[benchmark]626 fn set_allowance_for_all() -> Result<(), BenchmarkError> {627 bench_init! {628 owner: sub; collection: collection(owner); owner: cross_from_sub;629 operator: cross_sub;630 };631632 #[block]633 {634 <Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;635 }636637 Ok(())638 }639640 #[benchmark]641 fn allowance_for_all() -> Result<(), BenchmarkError> {642 bench_init! {643 owner: sub; collection: collection(owner); owner: cross_from_sub;644 operator: cross_sub;645 };646647 #[block]648 {649 <Pallet<T>>::allowance_for_all(&collection, &owner, &operator);650 }651652 Ok(())653 }654655 #[benchmark]656 fn repair_item() -> Result<(), BenchmarkError> {657 bench_init! {658 owner: sub; collection: collection(owner);659 owner: cross_from_sub;660 };661 let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;662663 #[block]664 {665 <Pallet<T>>::repair_item(&collection, item)?;666 }667668 Ok(())669 }670}pallets/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(())
}
runtime/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)
}
}
runtime/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 }
runtime/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 }