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
--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -54,7 +54,6 @@
 		variable_on_chain_schema,
 		const_on_chain_schema,
 		meta_update_permission: Default::default(),
-		transfers_enabled: true,
 	})
 	.and_then(CollectionHandle::try_get)
 	.map(cast)
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
before · pallets/refungible/src/benchmarking.rs
1use super::*;2use crate::{Pallet, Config, RefungibleHandle};34use sp_std::prelude::*;5use pallet_common::benchmarking::{create_collection_raw, create_data};6use frame_benchmarking::{benchmarks, account};7use nft_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};8use pallet_common::bench_init;9use core::convert::TryInto;10use core::iter::IntoIterator;1112const SEED: u32 = 1;1314fn create_max_item_data<T: Config>(15	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,16) -> CreateItemData<T> {17	let const_data = create_data(CUSTOM_DATA_LIMIT as usize).try_into().unwrap();18	let variable_data = create_data(CUSTOM_DATA_LIMIT as usize).try_into().unwrap();19	CreateItemData {20		const_data,21		variable_data,22		users: users.into_iter().collect(),23	}24}25fn create_max_item<T: Config>(26	collection: &RefungibleHandle<T>,27	sender: &T::CrossAccountId,28	users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,29) -> Result<TokenId, DispatchError> {30	<Pallet<T>>::create_item(&collection, sender, create_max_item_data(users))?;31	Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))32}3334fn create_collection<T: Config>(owner: T::AccountId) -> Result<RefungibleHandle<T>, DispatchError> {35	create_collection_raw(36		owner,37		CollectionMode::NFT,38		<Pallet<T>>::init_collection,39		RefungibleHandle::cast,40	)41}42benchmarks! {43	create_item {44		bench_init!{45			owner: sub; collection: collection(owner);46			sender: cross_from_sub(owner); to: cross_sub;47		};48	}: {create_max_item(&collection, &sender, [(to.clone(), 200)])?}4950	create_multiple_items {51		let b in 0..MAX_ITEMS_PER_BATCH;52		bench_init!{53			owner: sub; collection: collection(owner);54			sender: cross_from_sub(owner); to: cross_sub;55		};56		let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect();57	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}5859	// Other user left, token data is kept60	burn_item_partial {61		bench_init!{62			owner: sub; collection: collection(owner);63			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;64		};65		let item = create_max_item(&collection, &sender, [(burner.clone(), 200), (another_owner, 200)])?;66	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}67	// No users remaining, token is destroyed68	burn_item_fully {69		bench_init!{70			owner: sub; collection: collection(owner);71			sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;72		};73		let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;74	}: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}7576	transfer_normal {77		bench_init!{78			owner: sub; collection: collection(owner);79			sender: cross_from_sub(owner); receiver: cross_sub;80		};81		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;82	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100)?}83	// Target account is created84	transfer_creating {85		bench_init!{86			owner: sub; collection: collection(owner);87			sender: cross_from_sub(owner); receiver: cross_sub;88		};89		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;90	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100)?}91	// Source account is destroyed92	transfer_removing {93		bench_init!{94			owner: sub; collection: collection(owner);95			sender: cross_from_sub(owner); receiver: cross_sub;96		};97		let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;98	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200)?}99	// Source account destroyed, target created100	transfer_creating_removing {101		bench_init!{102			owner: sub; collection: collection(owner);103			sender: cross_from_sub(owner); receiver: cross_sub;104		};105		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;106	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200)?}107108	approve {109		bench_init!{110			owner: sub; collection: collection(owner);111			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;112		};113		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;114	}: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?}115116	transfer_from_normal {117		bench_init!{118			owner: sub; collection: collection(owner);119			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;120		};121		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;122		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;123	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100)?}124	// Target account is created125	transfer_from_creating {126		bench_init!{127			owner: sub; collection: collection(owner);128			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;129		};130		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;131		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;132	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100)?}133	// Source account is destroyed134	transfer_from_removing {135		bench_init!{136			owner: sub; collection: collection(owner);137			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;138		};139		let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;140		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;141	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200)?}142	// Source account destroyed, target created143	transfer_from_creating_removing {144		bench_init!{145			owner: sub; collection: collection(owner);146			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;147		};148		let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;149		<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;150	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200)?}151152	set_variable_metadata {153		let b in 0..CUSTOM_DATA_LIMIT;154		bench_init!{155			owner: sub; collection: collection(owner);156			sender: cross_from_sub(owner);157		};158		let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;159		let data = create_data(b as usize);160	}: {<Pallet<T>>::set_variable_metadata(&collection, &sender, item, data)?}161}
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)