git.delta.rocks / unique-network / refs/commits / 59f9c8e9550a

difftreelog

fix bencmarks for RFT&NFT pallets

PraetorP2023-02-14parent: #b84fc5c.patch.diff
in: master

2 files changed

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 super::*;18use crate::{Pallet, Config, NonfungibleHandle};1920use frame_benchmarking::{benchmarks, account};21use pallet_common::{22	bench_init,23	benchmarking::{create_collection_raw, property_key, property_value},24	CommonCollectionOperations,25};26use sp_std::prelude::*;27use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};2829const SEED: u32 = 1;3031fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {32	CreateItemData::<T> {33		owner,34		properties: Default::default(),35	}36}37fn create_max_item<T: Config>(38	collection: &NonfungibleHandle<T>,39	sender: &T::CrossAccountId,40	owner: T::CrossAccountId,41) -> Result<TokenId, DispatchError> {42	<Pallet<T>>::create_item(43		&collection,44		sender,45		create_max_item_data::<T>(owner),46		&Unlimited,47	)?;48	Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))49}5051fn create_collection<T: Config>(52	owner: T::CrossAccountId,53) -> Result<NonfungibleHandle<T>, DispatchError> {54	create_collection_raw(55		owner,56		CollectionMode::NFT,57		|owner: T::CrossAccountId, data| {58			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())59		},60		NonfungibleHandle::cast,61	)62}6364benchmarks! {65	create_item {66		bench_init!{67			owner: sub; collection: collection(owner);68			sender: cross_from_sub(owner); to: cross_sub;69		};70	}: {create_max_item(&collection, &sender, to.clone())?}7172	create_multiple_items {73		let b in 0..MAX_ITEMS_PER_BATCH;74		bench_init!{75			owner: sub; collection: collection(owner);76			sender: cross_from_sub(owner); to: cross_sub;77		};78		let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();79	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8081	create_multiple_items_ex {82		let b in 0..MAX_ITEMS_PER_BATCH;83		bench_init!{84			owner: sub; collection: collection(owner);85			sender: cross_from_sub(owner);86		};87		let data = (0..b).map(|i| {88			bench_init!(to: cross_sub(i););89			create_max_item_data::<T>(to)90		}).collect();91	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9293	burn_item {94		bench_init!{95			owner: sub; collection: collection(owner);96			sender: cross_from_sub(owner); burner: cross_sub;97		};98		let item = create_max_item(&collection, &sender, burner.clone())?;99	}: {<Pallet<T>>::burn(&collection, &burner, item)?}100101	burn_recursively_self_raw {102		bench_init!{103			owner: sub; collection: collection(owner);104			sender: cross_from_sub(owner); burner: cross_sub;105		};106		let item = create_max_item(&collection, &sender, burner.clone())?;107	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}108109	burn_recursively_breadth_plus_self_plus_self_per_each_raw {110		let b in 0..200;111		bench_init!{112			owner: sub; collection: collection(owner);113			sender: cross_from_sub(owner); burner: cross_sub;114		};115		let item = create_max_item(&collection, &sender, burner.clone())?;116		for i in 0..b {117			create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;118		}119	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}120121	transfer {122		bench_init!{123			owner: sub; collection: collection(owner);124			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;125		};126		let item = create_max_item(&collection, &owner, sender.clone())?;127	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}128129	approve {130		bench_init!{131			owner: sub; collection: collection(owner);132			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;133		};134		let item = create_max_item(&collection, &owner, sender.clone())?;135	}: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}136137	approve_from {138		bench_init!{139			owner: sub; collection: collection(owner);140			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;141		};142		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());143		let item = create_max_item(&collection, &owner, owner_eth.clone())?;144	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}145146	transfer_from {147		bench_init!{148			owner: sub; collection: collection(owner);149			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;150		};151		let item = create_max_item(&collection, &owner, sender.clone())?;152		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;153	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}154155	burn_from {156		bench_init!{157			owner: sub; collection: collection(owner);158			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;159		};160		let item = create_max_item(&collection, &owner, sender.clone())?;161		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;162	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}163164	set_token_property_permissions {165		let b in 0..MAX_PROPERTIES_PER_ITEM;166		bench_init!{167			owner: sub; collection: collection(owner);168			owner: cross_from_sub;169		};170		let perms = (0..b).map(|k| PropertyKeyPermission {171			key: property_key(k as usize),172			permission: PropertyPermission {173				mutable: false,174				collection_admin: false,175				token_owner: false,176			},177		}).collect::<Vec<_>>();178	}: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}179180	set_token_properties {181		let b in 0..MAX_PROPERTIES_PER_ITEM;182		bench_init!{183			owner: sub; collection: collection(owner);184			owner: cross_from_sub;185		};186		let perms = (0..b).map(|k| PropertyKeyPermission {187			key: property_key(k as usize),188			permission: PropertyPermission {189				mutable: false,190				collection_admin: true,191				token_owner: true,192			},193		}).collect::<Vec<_>>();194		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;195		let props = (0..b).map(|k| Property {196			key: property_key(k as usize),197			value: property_value(),198		}).collect::<Vec<_>>();199		let item = create_max_item(&collection, &owner, owner.clone())?;200	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}201202	delete_token_properties {203		let b in 0..MAX_PROPERTIES_PER_ITEM;204		bench_init!{205			owner: sub; collection: collection(owner);206			owner: cross_from_sub;207		};208		let perms = (0..b).map(|k| PropertyKeyPermission {209			key: property_key(k as usize),210			permission: PropertyPermission {211				mutable: true,212				collection_admin: true,213				token_owner: true,214			},215		}).collect::<Vec<_>>();216		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;217		let props = (0..b).map(|k| Property {218			key: property_key(k as usize),219			value: property_value(),220		}).collect::<Vec<_>>();221		let item = create_max_item(&collection, &owner, owner.clone())?;222		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;223		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();224	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}225226	token_owner {227		bench_init!{228			owner: sub; collection: collection(owner);229			owner: cross_from_sub;230		};231		let item = create_max_item(&collection, &owner, owner.clone())?;232233	}: {collection.token_owner(item)}234235	set_allowance_for_all {236		bench_init!{237			owner: sub; collection: collection(owner); owner: cross_from_sub;238			operator: cross_sub;239		};240	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}241242	allowance_for_all {243		bench_init!{244			owner: sub; collection: collection(owner); owner: cross_from_sub;245			operator: cross_sub;246		};247	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}248249	repair_item {250		bench_init!{251			owner: sub; collection: collection(owner);252			owner: cross_from_sub;253		};254		let item = create_max_item(&collection, &owner, owner.clone())?;255	}: {<Pallet<T>>::repair_item(&collection, item)?}256}
after · 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 super::*;18use crate::{Pallet, Config, NonfungibleHandle};1920use frame_benchmarking::{benchmarks, account};21use pallet_common::{22	bench_init,23	benchmarking::{create_collection_raw, property_key, property_value},24	CommonCollectionOperations,25};26use sp_std::prelude::*;27use up_data_structs::{28	CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited,29	PropertyPermission,30};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| {61			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())62		},63		NonfungibleHandle::cast,64	)65}6667benchmarks! {68	create_item {69		bench_init!{70			owner: sub; collection: collection(owner);71			sender: cross_from_sub(owner); to: cross_sub;72		};73	}: {create_max_item(&collection, &sender, to.clone())?}7475	create_multiple_items {76		let b in 0..MAX_ITEMS_PER_BATCH;77		bench_init!{78			owner: sub; collection: collection(owner);79			sender: cross_from_sub(owner); to: cross_sub;80		};81		let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();82	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8384	create_multiple_items_ex {85		let b in 0..MAX_ITEMS_PER_BATCH;86		bench_init!{87			owner: sub; collection: collection(owner);88			sender: cross_from_sub(owner);89		};90		let data = (0..b).map(|i| {91			bench_init!(to: cross_sub(i););92			create_max_item_data::<T>(to)93		}).collect();94	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9596	burn_item {97		bench_init!{98			owner: sub; collection: collection(owner);99			sender: cross_from_sub(owner); burner: cross_sub;100		};101		let item = create_max_item(&collection, &sender, burner.clone())?;102	}: {<Pallet<T>>::burn(&collection, &burner, item)?}103104	burn_recursively_self_raw {105		bench_init!{106			owner: sub; collection: collection(owner);107			sender: cross_from_sub(owner); burner: cross_sub;108		};109		let item = create_max_item(&collection, &sender, burner.clone())?;110	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}111112	burn_recursively_breadth_plus_self_plus_self_per_each_raw {113		let b in 0..200;114		bench_init!{115			owner: sub; collection: collection(owner);116			sender: cross_from_sub(owner); burner: cross_sub;117		};118		let item = create_max_item(&collection, &sender, burner.clone())?;119		for i in 0..b {120			create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;121		}122	}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}123124	transfer {125		bench_init!{126			owner: sub; collection: collection(owner);127			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;128		};129		let item = create_max_item(&collection, &owner, sender.clone())?;130	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}131132	approve {133		bench_init!{134			owner: sub; collection: collection(owner);135			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;136		};137		let item = create_max_item(&collection, &owner, sender.clone())?;138	}: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}139140	approve_from {141		bench_init!{142			owner: sub; collection: collection(owner);143			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;144		};145		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());146		let item = create_max_item(&collection, &owner, owner_eth.clone())?;147	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}148149	transfer_from {150		bench_init!{151			owner: sub; collection: collection(owner);152			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;153		};154		let item = create_max_item(&collection, &owner, sender.clone())?;155		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;156	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}157158	burn_from {159		bench_init!{160			owner: sub; collection: collection(owner);161			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;162		};163		let item = create_max_item(&collection, &owner, sender.clone())?;164		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;165	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}166167	set_token_property_permissions {168		let b in 0..MAX_PROPERTIES_PER_ITEM;169		bench_init!{170			owner: sub; collection: collection(owner);171			owner: cross_from_sub;172		};173		let perms = (0..b).map(|k| PropertyKeyPermission {174			key: property_key(k as usize),175			permission: PropertyPermission {176				mutable: false,177				collection_admin: false,178				token_owner: false,179			},180		}).collect::<Vec<_>>();181	}: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}182183	set_token_properties {184		let b in 0..MAX_PROPERTIES_PER_ITEM;185		bench_init!{186			owner: sub; collection: collection(owner);187			owner: cross_from_sub;188		};189		let perms = (0..b).map(|k| PropertyKeyPermission {190			key: property_key(k as usize),191			permission: PropertyPermission {192				mutable: false,193				collection_admin: true,194				token_owner: true,195			},196		}).collect::<Vec<_>>();197		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;198		let props = (0..b).map(|k| Property {199			key: property_key(k as usize),200			value: property_value(),201		}).collect::<Vec<_>>();202		let item = create_max_item(&collection, &owner, owner.clone())?;203	}: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}204205	delete_token_properties {206		let b in 0..MAX_PROPERTIES_PER_ITEM;207		bench_init!{208			owner: sub; collection: collection(owner);209			owner: cross_from_sub;210		};211		let perms = (0..b).map(|k| PropertyKeyPermission {212			key: property_key(k as usize),213			permission: PropertyPermission {214				mutable: true,215				collection_admin: true,216				token_owner: true,217			},218		}).collect::<Vec<_>>();219		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;220		let props = (0..b).map(|k| Property {221			key: property_key(k as usize),222			value: property_value(),223		}).collect::<Vec<_>>();224		let item = create_max_item(&collection, &owner, owner.clone())?;225		<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;226		let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();227	}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}228229	token_owner {230		bench_init!{231			owner: sub; collection: collection(owner);232			owner: cross_from_sub;233		};234		let item = create_max_item(&collection, &owner, owner.clone())?;235236	}: {collection.token_owner(item)}237238	set_allowance_for_all {239		bench_init!{240			owner: sub; collection: collection(owner); owner: cross_from_sub;241			operator: cross_sub;242		};243	}: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}244245	allowance_for_all {246		bench_init!{247			owner: sub; collection: collection(owner); owner: cross_from_sub;248			operator: cross_sub;249		};250	}: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}251252	repair_item {253		bench_init!{254			owner: sub; collection: collection(owner);255			owner: cross_from_sub;256		};257		let item = create_max_item(&collection, &owner, owner.clone())?;258	}: {<Pallet<T>>::repair_item(&collection, item)?}259}
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -25,7 +25,10 @@
 	benchmarking::{create_collection_raw, property_key, property_value},
 };
 use sp_std::prelude::*;
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};
+use up_data_structs::{
+	CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited,
+	PropertyPermission,
+};
 
 const SEED: u32 = 1;