git.delta.rocks / unique-network / refs/commits / 9c50a8cd1ee9

difftreelog

fix benchmarks

Daniel Shiposha2023-10-18parent: #cfd2e2a.patch.diff
in: master

5 files changed

modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -120,7 +120,9 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::NFT,
-		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+		|owner: T::CrossAccountId, data| {
+			<Pallet<T>>::init_collection(owner.clone(), Some(owner), data)
+		},
 		|h| h,
 	)
 }
modifiedpallets/foreign-assets/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/benchmarking.rs
+++ b/pallets/foreign-assets/src/benchmarking.rs
@@ -16,88 +16,29 @@
 
 #![allow(missing_docs)]
 
-use frame_benchmarking::{account, v2::*};
-use frame_support::traits::Currency;
+use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
-use sp_std::{boxed::Box, vec, vec::Vec};
-use staging_xcm::{opaque::latest::Junction::Parachain, v3::Junctions::X1, VersionedMultiLocation};
+use pallet_common::benchmarking::create_u16_data;
+use sp_std::vec;
+use staging_xcm::prelude::*;
+use up_data_structs::{CollectionMode, MAX_COLLECTION_NAME_LENGTH};
 
 use super::{Call, Config, Pallet};
-use crate::AssetMetadata;
 
-fn bounded<T: TryFrom<Vec<u8>>>(slice: &[u8]) -> T {
-	T::try_from(slice.to_vec())
-		.map_err(|_| "slice doesn't fit")
-		.unwrap()
-}
-
 #[benchmarks]
 mod benchmarks {
-	use super::*;
-
-	#[benchmark]
-	fn register_foreign_asset() -> Result<(), BenchmarkError> {
-		let owner: T::AccountId = account("user", 0, 1);
-		let location: VersionedMultiLocation = VersionedMultiLocation::from(X1(Parachain(1000)));
-		let metadata: AssetMetadata<
-			<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance,
-		> = AssetMetadata {
-			name: bounded(b"name"),
-			symbol: bounded(b"symbol"),
-			decimals: 18,
-			minimal_balance: 1u32.into(),
-		};
-		let mut balance: <<T as Config>::Currency as Currency<
-			<T as frame_system::Config>::AccountId,
-		>>::Balance = 4_000_000_000u32.into();
-		balance = balance * balance;
-		<T as Config>::Currency::make_free_balance_be(&owner, balance);
 
-		#[extrinsic_call]
-		_(
-			RawOrigin::Root,
-			owner,
-			Box::new(location),
-			Box::new(metadata),
-		);
-
-		Ok(())
-	}
+	use super::*;
 
 	#[benchmark]
-	fn update_foreign_asset() -> Result<(), BenchmarkError> {
-		let owner: T::AccountId = account("user", 0, 1);
-		let location: VersionedMultiLocation = VersionedMultiLocation::from(X1(Parachain(2000)));
-		let metadata: AssetMetadata<
-			<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance,
-		> = AssetMetadata {
-			name: bounded(b"name"),
-			symbol: bounded(b"symbol"),
-			decimals: 18,
-			minimal_balance: 1u32.into(),
-		};
-		let metadata2: AssetMetadata<
-			<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance,
-		> = AssetMetadata {
-			name: bounded(b"name2"),
-			symbol: bounded(b"symbol2"),
-			decimals: 18,
-			minimal_balance: 1u32.into(),
-		};
-		let mut balance: <<T as Config>::Currency as Currency<
-			<T as frame_system::Config>::AccountId,
-		>>::Balance = 4_000_000_000u32.into();
-		balance = balance * balance;
-		<T as Config>::Currency::make_free_balance_be(&owner, balance);
-		Pallet::<T>::register_foreign_asset(
-			RawOrigin::Root.into(),
-			owner,
-			Box::new(location.clone()),
-			Box::new(metadata),
-		)?;
+	fn force_register_foreign_asset() -> Result<(), BenchmarkError> {
+		let location =
+			MultiLocation::from(X3(Parachain(1000), PalletInstance(42), GeneralIndex(1)));
+		let name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
+		let mode = CollectionMode::NFT;
 
 		#[extrinsic_call]
-		_(RawOrigin::Root, 0, Box::new(location), Box::new(metadata2));
+		_(RawOrigin::Root, location, name, mode);
 
 		Ok(())
 	}
modifiedpallets/fungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_benchmarking::{account, v2::*};
-use pallet_common::{bench_init, benchmarking::create_collection_raw};
+use pallet_common::{bench_init, benchmarking::create_collection_raw, Pallet as PalletCommon};
 use sp_std::prelude::*;
 use up_data_structs::{budget::Unlimited, CollectionMode, MAX_ITEMS_PER_BATCH};
 
@@ -30,7 +30,9 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::Fungible(0),
-		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+		|owner: T::CrossAccountId, data| {
+			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)
+		},
 		FungibleHandle::cast,
 	)
 }
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
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 frame_benchmarking::v2::{account, benchmarks, BenchmarkError};18use pallet_common::{19	bench_init,20	benchmarking::{create_collection_raw, property_key, property_value},21	Pallet as PalletCommon,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| {61			<PalletCommon<T>>::init_collection(owner.clone(), Some(owner), data)62		},63		NonfungibleHandle::cast,64	)65}6667#[benchmarks]68mod benchmarks {69	use super::*;7071	#[benchmark]72	fn create_item() -> Result<(), BenchmarkError> {73		bench_init! {74			owner: sub; collection: collection(owner);75			sender: cross_from_sub(owner); to: cross_sub;76		};7778		#[block]79		{80			create_max_item(&collection, &sender, to)?;81		}8283		Ok(())84	}8586	#[benchmark]87	fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {88		bench_init! {89			owner: sub; collection: collection(owner);90			sender: cross_from_sub(owner); to: cross_sub;91		};92		let data = (0..b)93			.map(|_| create_max_item_data::<T>(to.clone()))94			.collect();9596		#[block]97		{98			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;99		}100101		Ok(())102	}103104	#[benchmark]105	fn create_multiple_items_ex(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {106		bench_init! {107			owner: sub; collection: collection(owner);108			sender: cross_from_sub(owner);109		};110		let data = (0..b)111			.map(|i| {112				bench_init!(to: cross_sub(i););113				create_max_item_data::<T>(to)114			})115			.collect();116117		#[block]118		{119			<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;120		}121122		Ok(())123	}124125	#[benchmark]126	fn burn_item() -> Result<(), BenchmarkError> {127		bench_init! {128			owner: sub; collection: collection(owner);129			sender: cross_from_sub(owner); burner: cross_sub;130		};131		let item = create_max_item(&collection, &sender, burner.clone())?;132133		#[block]134		{135			<Pallet<T>>::burn(&collection, &burner, item)?;136		}137138		Ok(())139	}140141	#[benchmark]142	fn transfer_raw() -> Result<(), BenchmarkError> {143		bench_init! {144			owner: sub; collection: collection(owner);145			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;146		};147		let item = create_max_item(&collection, &owner, sender.clone())?;148149		#[block]150		{151			<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?;152		}153154		Ok(())155	}156157	#[benchmark]158	fn approve() -> Result<(), BenchmarkError> {159		bench_init! {160			owner: sub; collection: collection(owner);161			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;162		};163		let item = create_max_item(&collection, &owner, sender.clone())?;164165		#[block]166		{167			<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;168		}169170		Ok(())171	}172173	#[benchmark]174	fn approve_from() -> Result<(), BenchmarkError> {175		bench_init! {176			owner: sub; collection: collection(owner);177			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;178		};179		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());180		let item = create_max_item(&collection, &owner, owner_eth.clone())?;181182		#[block]183		{184			<Pallet<T>>::set_allowance_from(185				&collection,186				&sender,187				&owner_eth,188				item,189				Some(&spender),190			)?;191		}192193		Ok(())194	}195196	#[benchmark]197	fn check_allowed_raw() -> 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())?;203		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;204205		#[block]206		{207			<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?;208		}209210		Ok(())211	}212213	#[benchmark]214	fn burn_from() -> Result<(), BenchmarkError> {215		bench_init! {216			owner: sub; collection: collection(owner);217			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;218		};219		let item = create_max_item(&collection, &owner, sender.clone())?;220		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;221222		#[block]223		{224			<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?;225		}226227		Ok(())228	}229230	#[benchmark]231	fn load_token_properties() -> Result<(), BenchmarkError> {232		bench_init! {233			owner: sub; collection: collection(owner);234			owner: cross_from_sub;235		};236237		let item = create_max_item(&collection, &owner, owner.clone())?;238239		#[block]240		{241			pallet_common::BenchmarkPropertyWriter::<T>::load_token_properties(&collection, item);242		}243244		Ok(())245	}246247	#[benchmark]248	fn write_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {249		bench_init! {250			owner: sub; collection: collection(owner);251			owner: cross_from_sub;252		};253254		let perms = (0..b)255			.map(|k| PropertyKeyPermission {256				key: property_key(k as usize),257				permission: PropertyPermission {258					mutable: false,259					collection_admin: true,260					token_owner: true,261				},262			})263			.collect::<Vec<_>>();264		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;265		let props = (0..b)266			.map(|k| Property {267				key: property_key(k as usize),268				value: property_value(),269			})270			.collect::<Vec<_>>();271		let item = create_max_item(&collection, &owner, owner.clone())?;272273		let lazy_collection_info =274			pallet_common::BenchmarkPropertyWriter::<T>::load_collection_info(&collection, &owner);275276		#[block]277		{278			let mut property_writer =279				pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);280281			property_writer.write_token_properties(282				item,283				props.into_iter(),284				crate::erc::ERC721TokenEvent::TokenChanged {285					token_id: item.into(),286				}287				.to_log(T::ContractAddress::get()),288			)?;289		}290291		Ok(())292	}293294	#[benchmark]295	fn set_token_property_permissions(296		b: Linear<0, MAX_PROPERTIES_PER_ITEM>,297	) -> 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: false,308					token_owner: false,309				},310			})311			.collect::<Vec<_>>();312313		#[block]314		{315			<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;316		}317318		Ok(())319	}320321	#[benchmark]322	fn set_allowance_for_all() -> Result<(), BenchmarkError> {323		bench_init! {324			owner: sub; collection: collection(owner); owner: cross_from_sub;325			operator: cross_sub;326		};327328		#[block]329		{330			<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;331		}332333		Ok(())334	}335336	#[benchmark]337	fn allowance_for_all() -> Result<(), BenchmarkError> {338		bench_init! {339			owner: sub; collection: collection(owner); owner: cross_from_sub;340			operator: cross_sub;341		};342343		#[block]344		{345			<Pallet<T>>::allowance_for_all(&collection, &owner, &operator);346		}347348		Ok(())349	}350351	#[benchmark]352	fn repair_item() -> Result<(), BenchmarkError> {353		bench_init! {354			owner: sub; collection: collection(owner);355			owner: cross_from_sub;356		};357		let item = create_max_item(&collection, &owner, owner.clone())?;358359		#[block]360		{361			<Pallet<T>>::repair_item(&collection, item)?;362		}363364		Ok(())365	}366}
modifiedpallets/structure/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -44,7 +44,7 @@
 		.unwrap();
 		T::CollectionDispatch::create(
 			caller_cross.clone(),
-			caller_cross.clone(),
+			Some(caller_cross.clone()),
 			CreateCollectionData {
 				mode: CollectionMode::NFT,
 				..Default::default()