git.delta.rocks / unique-network / refs/commits / e4d3792751ad

difftreelog

feat add benchmarks for burn_from

Yaroslav Bolyukin2021-11-05parent: #3d14ec5.patch.diff
in: master

12 files changed

modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
before · pallets/common/src/benchmarking.rs
1use sp_std::vec::Vec;2use crate::{Config, CollectionHandle};3use nft_data_structs::{4	CollectionMode, Collection, CollectionId, MAX_COLLECTION_NAME_LENGTH,5	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, OFFCHAIN_SCHEMA_LIMIT,6	VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT,7};8use frame_support::traits::{Currency, Get};9use core::convert::TryInto;10use sp_runtime::DispatchError;1112pub fn create_data(size: usize) -> Vec<u8> {13	(0..size).map(|v| (v & 0xff) as u8).collect()14}15pub fn create_u16_data(size: usize) -> Vec<u16> {16	(0..size).map(|v| (v & 0xffff) as u16).collect()17}1819pub fn create_collection_raw<T: Config, R>(20	owner: T::AccountId,21	mode: CollectionMode,22	handler: impl FnOnce(Collection<T>) -> Result<CollectionId, DispatchError>,23	cast: impl FnOnce(CollectionHandle<T>) -> R,24) -> Result<R, DispatchError> {25	T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());26	let name = create_u16_data(MAX_COLLECTION_NAME_LENGTH)27		.try_into()28		.unwrap();29	let description = create_u16_data(MAX_COLLECTION_DESCRIPTION_LENGTH)30		.try_into()31		.unwrap();32	let token_prefix = create_data(MAX_TOKEN_PREFIX_LENGTH).try_into().unwrap();33	let offchain_schema = create_data(OFFCHAIN_SCHEMA_LIMIT as usize)34		.try_into()35		.unwrap();36	let variable_on_chain_schema = create_data(VARIABLE_ON_CHAIN_SCHEMA_LIMIT as usize)37		.try_into()38		.unwrap();39	let const_on_chain_schema = create_data(CONST_ON_CHAIN_SCHEMA_LIMIT as usize)40		.try_into()41		.unwrap();42	handler(Collection {43		owner,44		mode,45		access: Default::default(),46		name,47		description,48		token_prefix,49		mint_mode: true,50		offchain_schema,51		schema_version: Default::default(),52		sponsorship: Default::default(),53		limits: Default::default(),54		variable_on_chain_schema,55		const_on_chain_schema,56		meta_update_permission: Default::default(),57		transfers_enabled: true,58	})59	.and_then(CollectionHandle::try_get)60	.map(cast)61}6263#[macro_export]64macro_rules! bench_init {65	($name:ident: sub $(($id:expr))?; $($rest:tt)*) => {66		let $name: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);67		bench_init!($($rest)*);68	};69	($name:ident: collection($owner:ident); $($rest:tt)*) => {70		let $name = create_collection::<T>($owner.clone())?;71		bench_init!($($rest)*);72	};73	($name:ident: cross; $($rest:tt)*) => {74		let $name = T::CrossAccountId::from_sub($name);75		bench_init!($($rest)*);76	};77	($name:ident: cross_sub $(($id:expr))?; $($rest:tt)*) => {78		let account: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);79		let $name = T::CrossAccountId::from_sub(account);80		bench_init!($($rest)*);81	};82	($name:ident: cross_from_sub; $($rest:tt)*) => {83		let $name = T::CrossAccountId::from_sub($name);84		bench_init!($($rest)*);85	};86	($name:ident: cross_from_sub($from:ident); $($rest:tt)*) => {87		let $name = T::CrossAccountId::from_sub($from);88		bench_init!($($rest)*);89	};90	() => {}91}
after · pallets/common/src/benchmarking.rs
1use sp_std::vec::Vec;2use crate::{Config, CollectionHandle};3use nft_data_structs::{4	CollectionMode, Collection, CollectionId, MAX_COLLECTION_NAME_LENGTH,5	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, OFFCHAIN_SCHEMA_LIMIT,6	VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT,7};8use frame_support::traits::{Currency, Get};9use core::convert::TryInto;10use sp_runtime::DispatchError;1112pub fn create_data(size: usize) -> Vec<u8> {13	(0..size).map(|v| (v & 0xff) as u8).collect()14}15pub fn create_u16_data(size: usize) -> Vec<u16> {16	(0..size).map(|v| (v & 0xffff) as u16).collect()17}1819pub fn create_collection_raw<T: Config, R>(20	owner: T::AccountId,21	mode: CollectionMode,22	handler: impl FnOnce(Collection<T>) -> Result<CollectionId, DispatchError>,23	cast: impl FnOnce(CollectionHandle<T>) -> R,24) -> Result<R, DispatchError> {25	T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());26	let name = create_u16_data(MAX_COLLECTION_NAME_LENGTH)27		.try_into()28		.unwrap();29	let description = create_u16_data(MAX_COLLECTION_DESCRIPTION_LENGTH)30		.try_into()31		.unwrap();32	let token_prefix = create_data(MAX_TOKEN_PREFIX_LENGTH).try_into().unwrap();33	let offchain_schema = create_data(OFFCHAIN_SCHEMA_LIMIT as usize)34		.try_into()35		.unwrap();36	let variable_on_chain_schema = create_data(VARIABLE_ON_CHAIN_SCHEMA_LIMIT as usize)37		.try_into()38		.unwrap();39	let const_on_chain_schema = create_data(CONST_ON_CHAIN_SCHEMA_LIMIT as usize)40		.try_into()41		.unwrap();42	handler(Collection {43		owner,44		mode,45		access: Default::default(),46		name,47		description,48		token_prefix,49		mint_mode: true,50		offchain_schema,51		schema_version: Default::default(),52		sponsorship: Default::default(),53		limits: Default::default(),54		variable_on_chain_schema,55		const_on_chain_schema,56		meta_update_permission: Default::default(),57	})58	.and_then(CollectionHandle::try_get)59	.map(cast)60}6162#[macro_export]63macro_rules! bench_init {64	($name:ident: sub $(($id:expr))?; $($rest:tt)*) => {65		let $name: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);66		bench_init!($($rest)*);67	};68	($name:ident: collection($owner:ident); $($rest:tt)*) => {69		let $name = create_collection::<T>($owner.clone())?;70		bench_init!($($rest)*);71	};72	($name:ident: cross; $($rest:tt)*) => {73		let $name = T::CrossAccountId::from_sub($name);74		bench_init!($($rest)*);75	};76	($name:ident: cross_sub $(($id:expr))?; $($rest:tt)*) => {77		let account: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);78		let $name = T::CrossAccountId::from_sub(account);79		bench_init!($($rest)*);80	};81	($name:ident: cross_from_sub; $($rest:tt)*) => {82		let $name = T::CrossAccountId::from_sub($name);83		bench_init!($($rest)*);84	};85	($name:ident: cross_from_sub($from:ident); $($rest:tt)*) => {86		let $name = T::CrossAccountId::from_sub($from);87		bench_init!($($rest)*);88	};89	() => {}90}
modifiedpallets/fungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -58,4 +58,13 @@
 		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200))?;
 		<Pallet<T>>::set_allowance(&collection, &sender, &spender, 200)?;
 	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, 100)?}
+
+	burn_from {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;
+		};
+		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200))?;
+		<Pallet<T>>::set_allowance(&collection, &sender, &burner, 200)?;
+	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, 100)?}
 }
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -37,7 +37,7 @@
 	}
 
 	fn burn_from() -> Weight {
-		0
+		<SelfWeightOf<T>>::burn_from()
 	}
 
 	fn set_variable_metadata(_bytes: u32) -> Weight {
modifiedpallets/fungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -75,6 +75,14 @@
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Fungible Allowance (r:1 w:1)
+	// Storage: Fungible TotalSupply (r:1 w:1)
+	// Storage: Fungible Balance (r:1 w:1)
+	fn burn_from() -> Weight {
+		(55_874_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(3 as Weight))
+	}
 }
 
 // For backwards compatibility and tests
@@ -113,4 +121,12 @@
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
+	// Storage: Fungible Allowance (r:1 w:1)
+	// Storage: Fungible TotalSupply (r:1 w:1)
+	// Storage: Fungible Balance (r:1 w:1)
+	fn burn_from() -> Weight {
+		(55_874_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
+	}
 }
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -89,6 +89,15 @@
 		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;
 	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item)?}
 
+	burn_from {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, sender.clone())?;
+		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;
+	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item)?}
+
 	set_variable_metadata {
 		let b in 0..CUSTOM_DATA_LIMIT;
 		bench_init!{
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -38,7 +38,7 @@
 	}
 
 	fn burn_from() -> Weight {
-		0
+		<SelfWeightOf<T>>::burn_from()
 	}
 
 	fn set_variable_metadata(bytes: u32) -> Weight {
modifiedpallets/nonfungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -98,6 +98,15 @@
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
+	// Storage: Nonfungible Allowance (r:1 w:1)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	fn burn_from() -> Weight {
+		(53_429_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add(T::DbWeight::get().writes(4 as Weight))
+	}
 	// Storage: Nonfungible TokenData (r:1 w:1)
 	fn set_variable_metadata(_b: u32, ) -> Weight {
 		(6_380_000 as Weight)
@@ -163,6 +172,15 @@
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
+	// Storage: Nonfungible Allowance (r:1 w:1)
+	// Storage: Nonfungible TokenData (r:1 w:1)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible Owned (r:0 w:1)
+	fn burn_from() -> Weight {
+		(53_429_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
+	}
 	// Storage: Nonfungible TokenData (r:1 w:1)
 	fn set_variable_metadata(_b: u32, ) -> Weight {
 		(6_380_000 as Weight)
modifiedpallets/refungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -149,6 +149,16 @@
 		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;
 	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200)?}
 
+	// Both source account and token is destroyed
+	burn_from {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;
+		<Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;
+	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200)?}
+
 	set_variable_metadata {
 		let b in 0..CUSTOM_DATA_LIMIT;
 		bench_init!{
modifiedpallets/refungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -166,6 +166,18 @@
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 	}
+	// Storage: Refungible Allowance (r:1 w:1)
+	// Storage: Refungible TotalSupply (r:1 w:1)
+	// Storage: Refungible Balance (r:1 w:1)
+	// Storage: Refungible AccountBalance (r:1 w:1)
+	// Storage: Refungible TokensBurnt (r:1 w:1)
+	// Storage: Refungible TokenData (r:0 w:1)
+	// Storage: Refungible Owned (r:0 w:1)
+	fn burn_from() -> Weight {
+		(60_903_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add(T::DbWeight::get().writes(7 as Weight))
+	}
 	// Storage: Refungible TokenData (r:1 w:1)
 	fn set_variable_metadata(_b: u32, ) -> Weight {
 		(6_801_000 as Weight)
@@ -292,6 +304,18 @@
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 	}
+	// Storage: Refungible Allowance (r:1 w:1)
+	// Storage: Refungible TotalSupply (r:1 w:1)
+	// Storage: Refungible Balance (r:1 w:1)
+	// Storage: Refungible AccountBalance (r:1 w:1)
+	// Storage: Refungible TokensBurnt (r:1 w:1)
+	// Storage: Refungible TokenData (r:0 w:1)
+	// Storage: Refungible Owned (r:0 w:1)
+	fn burn_from() -> Weight {
+		(60_903_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
+	}
 	// Storage: Refungible TokenData (r:1 w:1)
 	fn set_variable_metadata(_b: u32, ) -> Weight {
 		(6_801_000 as Weight)
modifiedpallets/scheduler/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -33,7 +33,7 @@
 // Add `n` named items to the schedule
 fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
 	// Essentially a no-op call.
-	let call = frame_system::Call::set_storage(vec![]);
+	let call = frame_system::Call::set_storage { items: vec![] };
 	for i in 0..n {
 		// Named schedule is strictly heavier than anonymous
 		Scheduler::<T>::do_schedule_named(
@@ -61,7 +61,7 @@
 		let periodic = Some((T::BlockNumber::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
-		let call = Box::new(frame_system::Call::set_storage(vec![]).into());
+		let call = Box::new(frame_system::Call::set_storage { items: vec![] }.into());
 
 		fill_schedule::<T>(when, s)?;
 	}: _(RawOrigin::Root, when, periodic, priority, call)
@@ -98,7 +98,7 @@
 		let periodic = Some((T::BlockNumber::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
-		let call = Box::new(frame_system::Call::set_storage(vec![]).into());
+		let call = Box::new(frame_system::Call::set_storage { items: vec![] }.into());
 
 		fill_schedule::<T>(when, s)?;
 	}: _(RawOrigin::Root, id, when, periodic, priority, call)
modifiedruntime/Cargo.tomldiffbeforeafterboth
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -23,7 +23,9 @@
     'frame-support/runtime-benchmarks',
     'frame-system-benchmarking',
     'frame-system/runtime-benchmarks',
+    'pallet-ethereum/runtime-benchmarks',
     'pallet-evm-migration/runtime-benchmarks',
+    'pallet-evm-coder-substrate/runtime-benchmarks',
     'pallet-balances/runtime-benchmarks',
     'pallet-timestamp/runtime-benchmarks',
     'pallet-common/runtime-benchmarks',
modifiedruntime/src/lib.rsdiffbeforeafterboth
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -1327,6 +1327,7 @@
 			list_benchmark!(list, extra, pallet_fungible, Fungible);
 			list_benchmark!(list, extra, pallet_refungible, Refungible);
 			list_benchmark!(list, extra, pallet_nonfungible, Nonfungible);
+			// list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
 
 			let storage_info = AllPalletsWithSystem::storage_info();
 
@@ -1360,6 +1361,7 @@
 			add_benchmark!(params, batches, pallet_fungible, Fungible);
 			add_benchmark!(params, batches, pallet_refungible, Refungible);
 			add_benchmark!(params, batches, pallet_nonfungible, Nonfungible);
+			// add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
 
 			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
 			Ok(batches)