git.delta.rocks / unique-network / refs/commits / 4e1bd65c37e5

difftreelog

feat(nonfungible) benchmarking

Yaroslav Bolyukin2021-10-22parent: #54a17a4.patch.diff
in: master

5 files changed

modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -20,6 +20,7 @@
 evm-coder = { default-features = false, path = '../../crates/evm-coder' }
 pallet-evm-coder-substrate = { default-features = false, path = '../evm-coder-substrate' }
 ethereum = { default-features = false, version = "0.9.0" }
+frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.10' }
 
 [features]
 default = ["std"]
@@ -33,5 +34,10 @@
     "evm-coder/std",
     "ethereum/std",
     "pallet-evm-coder-substrate/std",
+    'frame-benchmarking/std',
+]
+runtime-benchmarks = [
+    'frame-benchmarking',
+    'frame-support/runtime-benchmarks',
+    'frame-system/runtime-benchmarks',
 ]
-runtime-benchmarks = []
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -1 +1,101 @@
-#![cfg(feature = "runtime-benchmarking")]
+use super::*;
+use crate::{Pallet, Config, NonfungibleHandle};
+
+use sp_std::prelude::*;
+use pallet_common::benchmarking::{create_collection_raw, create_data};
+use frame_benchmarking::{benchmarks, account};
+use nft_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};
+use pallet_common::bench_init;
+use core::convert::TryInto;
+
+const SEED: u32 = 1;
+
+fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {
+	let const_data = create_data(CUSTOM_DATA_LIMIT as usize).try_into().unwrap();
+	let variable_data = create_data(CUSTOM_DATA_LIMIT as usize).try_into().unwrap();
+	CreateItemData {
+		const_data,
+		variable_data,
+		owner,
+	}
+}
+fn create_max_item<T: Config>(
+	collection: &NonfungibleHandle<T>,
+	sender: &T::CrossAccountId,
+	owner: T::CrossAccountId,
+) -> Result<TokenId, DispatchError> {
+	<Pallet<T>>::create_item(&collection, sender, create_max_item_data(owner))?;
+	Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))
+}
+
+fn create_collection<T: Config>(
+	owner: T::AccountId,
+) -> Result<NonfungibleHandle<T>, DispatchError> {
+	create_collection_raw(
+		owner,
+		CollectionMode::NFT,
+		<Pallet<T>>::init_collection,
+		NonfungibleHandle::cast,
+	)
+}
+
+benchmarks! {
+	create_item {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			sender: cross_from_sub(owner); to: cross_sub;
+		};
+	}: {create_max_item(&collection, &sender, to.clone())?}
+
+	create_multiple_items {
+		let b in 0..MAX_ITEMS_PER_BATCH;
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			sender: cross_from_sub(owner); to: cross_sub;
+		};
+		let data = (0..b).map(|_| create_max_item_data(to.clone())).collect();
+	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+
+	burn_item {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			sender: cross_from_sub(owner); burner: cross_sub;
+		};
+		let item = create_max_item(&collection, &sender, burner.clone())?;
+	}: {<Pallet<T>>::burn(&collection, &burner, item)?}
+
+	transfer {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, sender.clone())?;
+	}: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item)?}
+
+	approve {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, sender.clone())?;
+	}: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}
+
+	transfer_from {
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, sender.clone())?;
+		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;
+	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item)?}
+
+	set_variable_metadata {
+		let b in 0..CUSTOM_DATA_LIMIT;
+		bench_init!{
+			owner: sub; collection: collection(owner);
+			owner: cross_from_sub; sender: cross_sub;
+		};
+		let item = create_max_item(&collection, &owner, sender.clone())?;
+		let data = create_data(b as usize);
+	}: {<Pallet<T>>::set_variable_metadata(&collection, &sender, item, data)?}
+}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -9,8 +9,8 @@
 use sp_std::vec::Vec;
 
 use crate::{
-	AccountBalance, Allowance, Config, CreateItemData, DataKind, Error, NonfungibleHandle, Owned,
-	Owner, Pallet, SelfWeightOf, TokenData, weights::WeightInfo,
+	AccountBalance, Allowance, Config, CreateItemData, Error, NonfungibleHandle, Owned, Pallet,
+	SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,
 };
 
 pub struct CommonWeights<T: Config>(PhantomData<T>);
@@ -39,8 +39,8 @@
 		<SelfWeightOf<T>>::transfer_from()
 	}
 
-	fn set_variable_metadata(_bytes: u32) -> Weight {
-		<SelfWeightOf<T>>::set_variable_metadata()
+	fn set_variable_metadata(bytes: u32) -> Weight {
+		<SelfWeightOf<T>>::set_variable_metadata(bytes)
 	}
 }
 
@@ -67,7 +67,7 @@
 	) -> DispatchResultWithPostInfo {
 		with_weight(
 			<Pallet<T>>::create_item(self, &sender, map_create_data(data, &to)?),
-			<SelfWeightOf<T>>::create_item(),
+			<CommonWeights<T>>::create_item(),
 		)
 	}
 
@@ -85,7 +85,7 @@
 		let amount = data.len();
 		with_weight(
 			<Pallet<T>>::create_multiple_items(self, &sender, data),
-			<SelfWeightOf<T>>::create_multiple_items(amount as u32),
+			<CommonWeights<T>>::create_multiple_items(amount as u32),
 		)
 	}
 
@@ -99,7 +99,7 @@
 		if amount == 1 {
 			with_weight(
 				<Pallet<T>>::burn(&self, &sender, token),
-				<SelfWeightOf<T>>::burn_item(),
+				<CommonWeights<T>>::burn_item(),
 			)
 		} else {
 			Ok(().into())
@@ -117,7 +117,7 @@
 		if amount == 1 {
 			with_weight(
 				<Pallet<T>>::transfer(&self, &from, &to, token),
-				<SelfWeightOf<T>>::transfer(),
+				<CommonWeights<T>>::transfer(),
 			)
 		} else {
 			Ok(().into())
@@ -139,7 +139,7 @@
 			} else {
 				<Pallet<T>>::set_allowance(&self, &sender, token, None)
 			},
-			<SelfWeightOf<T>>::approve(),
+			<CommonWeights<T>>::approve(),
 		)
 	}
 
@@ -156,7 +156,7 @@
 		if amount == 1 {
 			with_weight(
 				<Pallet<T>>::transfer_from(&self, &sender, &from, &to, token),
-				<SelfWeightOf<T>>::transfer_from(),
+				<CommonWeights<T>>::transfer_from(),
 			)
 		} else {
 			Ok(().into())
@@ -169,9 +169,10 @@
 		token: TokenId,
 		data: Vec<u8>,
 	) -> DispatchResultWithPostInfo {
+		let len = data.len();
 		with_weight(
 			<Pallet<T>>::set_variable_metadata(&self, &sender, token, data),
-			<SelfWeightOf<T>>::set_variable_metadata(),
+			<CommonWeights<T>>::set_variable_metadata(len as u32),
 		)
 	}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -16,6 +16,7 @@
 use codec::{Encode, Decode};
 
 pub use pallet::*;
+#[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking;
 pub mod common;
 pub mod erc;
modifiedpallets/nonfungible/src/weights.rsdiffbeforeafterboth
1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
2
3//! Autogenerated weights for pallet_nonfungible
4//!
5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
6//! DATE: 2021-10-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128
8
9// Executed Command:
10// target/release/nft
11// benchmark
12// --pallet
13// pallet-nonfungible
14// --wasm-execution
15// compiled
16// --extrinsic
17// *
18// --template
19// .maintain/frame-weight-template.hbs
20// --steps=50
21// --repeat=20
22// --output=./pallets/nonfungible/src/weights.rs
23
24
1#![cfg_attr(rustfmt, rustfmt_skip)]25#![cfg_attr(rustfmt, rustfmt_skip)]
5use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};29use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
6use sp_std::marker::PhantomData;30use sp_std::marker::PhantomData;
731
32/// Weight functions needed for pallet_nonfungible.
8pub trait WeightInfo {33pub trait WeightInfo {
9	fn create_item() -> Weight;34	fn create_item() -> Weight;
10	fn create_multiple_items(b: u32) -> Weight;35	fn create_multiple_items(b: u32, ) -> Weight;
11	fn burn_item() -> Weight;36	fn burn_item() -> Weight;
12	fn transfer() -> Weight;37	fn transfer() -> Weight;
13	fn approve() -> Weight;38	fn approve() -> Weight;
14	fn transfer_from() -> Weight;39	fn transfer_from() -> Weight;
15	fn set_variable_metadata() -> Weight;40	fn set_variable_metadata(b: u32, ) -> Weight;
16}41}
1742
43/// Weights for pallet_nonfungible using the Substrate node and recommended hardware.
18pub struct SubstrateWeight<T>(PhantomData<T>);44pub struct SubstrateWeight<T>(PhantomData<T>);
19impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {45impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
46	// Storage: Nonfungible TokensMinted (r:1 w:1)
47	// Storage: Nonfungible AccountBalance (r:1 w:1)
48	// Storage: Nonfungible TokenData (r:0 w:1)
49	// Storage: Nonfungible Owned (r:0 w:1)
20    fn create_item() -> Weight {0}50	fn create_item() -> Weight {
51		(16_902_000 as Weight)
52			.saturating_add(T::DbWeight::get().reads(2 as Weight))
53			.saturating_add(T::DbWeight::get().writes(4 as Weight))
54	}
55	// Storage: Nonfungible TokensMinted (r:1 w:1)
56	// Storage: Nonfungible AccountBalance (r:1 w:1)
57	// Storage: Nonfungible TokenData (r:0 w:4)
58	// Storage: Nonfungible Owned (r:0 w:4)
21	fn create_multiple_items(_b: u32) -> Weight {0}59	fn create_multiple_items(b: u32, ) -> Weight {
60		(15_860_000 as Weight)
61			// Standard Error: 5_000
62			.saturating_add((3_916_000 as Weight).saturating_mul(b as Weight))
63			.saturating_add(T::DbWeight::get().reads(2 as Weight))
64			.saturating_add(T::DbWeight::get().writes(2 as Weight))
65			.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
66	}
67	// Storage: Nonfungible TokenData (r:1 w:1)
68	// Storage: Nonfungible TokensBurnt (r:1 w:1)
69	// Storage: Nonfungible Allowance (r:1 w:0)
70	// Storage: Nonfungible Owned (r:0 w:1)
22	fn burn_item() -> Weight {0}71	fn burn_item() -> Weight {
72		(17_966_000 as Weight)
73			.saturating_add(T::DbWeight::get().reads(3 as Weight))
74			.saturating_add(T::DbWeight::get().writes(3 as Weight))
75	}
76	// Storage: Nonfungible TokenData (r:1 w:1)
77	// Storage: Nonfungible AccountBalance (r:2 w:2)
78	// Storage: Nonfungible Allowance (r:1 w:0)
79	// Storage: Nonfungible Owned (r:0 w:2)
23	fn transfer() -> Weight {0}80	fn transfer() -> Weight {
81		(23_886_000 as Weight)
82			.saturating_add(T::DbWeight::get().reads(4 as Weight))
83			.saturating_add(T::DbWeight::get().writes(5 as Weight))
84	}
85	// Storage: Nonfungible TokenData (r:1 w:0)
86	// Storage: Nonfungible Allowance (r:1 w:1)
24	fn approve() -> Weight {0}87	fn approve() -> Weight {
88		(14_697_000 as Weight)
89			.saturating_add(T::DbWeight::get().reads(2 as Weight))
90			.saturating_add(T::DbWeight::get().writes(1 as Weight))
91	}
92	// Storage: Nonfungible Allowance (r:1 w:1)
93	// Storage: Nonfungible TokenData (r:1 w:1)
94	// Storage: Nonfungible AccountBalance (r:2 w:2)
95	// Storage: Nonfungible Owned (r:0 w:2)
25	fn transfer_from() -> Weight {0}96	fn transfer_from() -> Weight {
97		(28_001_000 as Weight)
98			.saturating_add(T::DbWeight::get().reads(4 as Weight))
99			.saturating_add(T::DbWeight::get().writes(6 as Weight))
100	}
101	// Storage: Nonfungible TokenData (r:1 w:1)
26	fn set_variable_metadata() -> Weight {0}102	fn set_variable_metadata(_b: u32, ) -> Weight {
103		(6_380_000 as Weight)
104			.saturating_add(T::DbWeight::get().reads(1 as Weight))
105			.saturating_add(T::DbWeight::get().writes(1 as Weight))
106	}
27}107}
28108
109// For backwards compatibility and tests
29impl WeightInfo for () {110impl WeightInfo for () {
111	// Storage: Nonfungible TokensMinted (r:1 w:1)
112	// Storage: Nonfungible AccountBalance (r:1 w:1)
113	// Storage: Nonfungible TokenData (r:0 w:1)
114	// Storage: Nonfungible Owned (r:0 w:1)
30    fn create_item() -> Weight {0}115	fn create_item() -> Weight {
116		(16_902_000 as Weight)
117			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
118			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
119	}
120	// Storage: Nonfungible TokensMinted (r:1 w:1)
121	// Storage: Nonfungible AccountBalance (r:1 w:1)
122	// Storage: Nonfungible TokenData (r:0 w:4)
123	// Storage: Nonfungible Owned (r:0 w:4)
31	fn create_multiple_items(_b: u32) -> Weight {0}124	fn create_multiple_items(b: u32, ) -> Weight {
125		(15_860_000 as Weight)
126			// Standard Error: 5_000
127			.saturating_add((3_916_000 as Weight).saturating_mul(b as Weight))
128			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
129			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
130			.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
131	}
132	// Storage: Nonfungible TokenData (r:1 w:1)
133	// Storage: Nonfungible TokensBurnt (r:1 w:1)
134	// Storage: Nonfungible Allowance (r:1 w:0)
135	// Storage: Nonfungible Owned (r:0 w:1)
32	fn burn_item() -> Weight {0}136	fn burn_item() -> Weight {
137		(17_966_000 as Weight)
138			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
139			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
140	}
141	// Storage: Nonfungible TokenData (r:1 w:1)
142	// Storage: Nonfungible AccountBalance (r:2 w:2)
143	// Storage: Nonfungible Allowance (r:1 w:0)
144	// Storage: Nonfungible Owned (r:0 w:2)
33	fn transfer() -> Weight {0}145	fn transfer() -> Weight {
146		(23_886_000 as Weight)
147			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
148			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
149	}
150	// Storage: Nonfungible TokenData (r:1 w:0)
151	// Storage: Nonfungible Allowance (r:1 w:1)
34	fn approve() -> Weight {0}152	fn approve() -> Weight {
153		(14_697_000 as Weight)
154			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
155			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
156	}
157	// Storage: Nonfungible Allowance (r:1 w:1)
158	// Storage: Nonfungible TokenData (r:1 w:1)
159	// Storage: Nonfungible AccountBalance (r:2 w:2)
160	// Storage: Nonfungible Owned (r:0 w:2)
35	fn transfer_from() -> Weight {0}161	fn transfer_from() -> Weight {
162		(28_001_000 as Weight)
163			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
164			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
165	}
166	// Storage: Nonfungible TokenData (r:1 w:1)
36	fn set_variable_metadata() -> Weight {0}167	fn set_variable_metadata(_b: u32, ) -> Weight {
168		(6_380_000 as Weight)
169			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
170			.saturating_add(RocksDbWeight::get().writes(1 as Weight))