difftreelog
feat rmrk-core benchmarking
in: master
11 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -93,5 +93,9 @@
bench-structure:
make _bench PALLET=structure
+.PHONY: bench-rmrk-core
+bench-rmrk-core:
+ make _bench PALLET=proxy-rmrk-core
+
.PHONY: bench
bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -109,7 +109,7 @@
create_collection_raw(
owner,
CollectionMode::NFT,
- |owner, data| <Pallet<T>>::init_collection(owner, data),
+ |owner, data| <Pallet<T>>::init_collection(owner, data, true),
|h| h,
)
}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -427,7 +427,7 @@
/// Target collection doesn't supports this operation
UnsupportedOperation,
- /// Not sufficient founds to perform action
+ /// Not sufficient funds to perform action
NotSufficientFounds,
/// Collection has nesting disabled
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth1// 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 sp_std::prelude::*;21use pallet_common::benchmarking::{create_collection_raw, property_key, property_value};22use frame_benchmarking::{benchmarks, account};23use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};24use pallet_common::bench_init;2526const SEED: u32 = 1;2728fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {29 CreateItemData::<T> {30 owner,31 properties: Default::default(),32 }33}34fn create_max_item<T: Config>(35 collection: &NonfungibleHandle<T>,36 sender: &T::CrossAccountId,37 owner: T::CrossAccountId,38) -> Result<TokenId, DispatchError> {39 <Pallet<T>>::create_item(40 &collection,41 sender,42 create_max_item_data::<T>(owner),43 &Unlimited,44 )?;45 Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))46}4748fn create_collection<T: Config>(49 owner: T::CrossAccountId,50) -> Result<NonfungibleHandle<T>, DispatchError> {51 create_collection_raw(52 owner,53 CollectionMode::NFT,54 <Pallet<T>>::init_collection,55 NonfungibleHandle::cast,56 )57}5859benchmarks! {60 create_item {61 bench_init!{62 owner: sub; collection: collection(owner);63 sender: cross_from_sub(owner); to: cross_sub;64 };65 }: {create_max_item(&collection, &sender, to.clone())?}6667 create_multiple_items {68 let b in 0..MAX_ITEMS_PER_BATCH;69 bench_init!{70 owner: sub; collection: collection(owner);71 sender: cross_from_sub(owner); to: cross_sub;72 };73 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();74 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}7576 create_multiple_items_ex {77 let b in 0..MAX_ITEMS_PER_BATCH;78 bench_init!{79 owner: sub; collection: collection(owner);80 sender: cross_from_sub(owner);81 };82 let data = (0..b).map(|i| {83 bench_init!(to: cross_sub(i););84 create_max_item_data::<T>(to)85 }).collect();86 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8788 burn_item {89 bench_init!{90 owner: sub; collection: collection(owner);91 sender: cross_from_sub(owner); burner: cross_sub;92 };93 let item = create_max_item(&collection, &sender, burner.clone())?;94 }: {<Pallet<T>>::burn(&collection, &burner, item)?}9596 burn_recursively_self_raw {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_recursively(&collection, &burner, item, &Unlimited, &Unlimited)}103104 burn_recursively_breadth_plus_self_plus_self_per_each_raw {105 let b in 0..200;106 bench_init!{107 owner: sub; collection: collection(owner);108 sender: cross_from_sub(owner); burner: cross_sub;109 };110 let item = create_max_item(&collection, &sender, burner.clone())?;111 for i in 0..b {112 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;113 }114 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)}115116 transfer {117 bench_init!{118 owner: sub; collection: collection(owner);119 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;120 };121 let item = create_max_item(&collection, &owner, sender.clone())?;122 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}123124 approve {125 bench_init!{126 owner: sub; collection: collection(owner);127 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;128 };129 let item = create_max_item(&collection, &owner, sender.clone())?;130 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}131132 transfer_from {133 bench_init!{134 owner: sub; collection: collection(owner);135 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;136 };137 let item = create_max_item(&collection, &owner, sender.clone())?;138 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;139 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}140141 burn_from {142 bench_init!{143 owner: sub; collection: collection(owner);144 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;145 };146 let item = create_max_item(&collection, &owner, sender.clone())?;147 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;148 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}149150 set_property_permissions {151 let b in 0..MAX_PROPERTIES_PER_ITEM;152 bench_init!{153 owner: sub; collection: collection(owner);154 owner: cross_from_sub;155 };156 let perms = (0..b).map(|k| PropertyKeyPermission {157 key: property_key(k as usize),158 permission: PropertyPermission {159 mutable: false,160 collection_admin: false,161 token_owner: false,162 },163 }).collect::<Vec<_>>();164 }: {<Pallet<T>>::set_property_permissions(&collection, &owner, perms)?}165166 set_token_properties {167 let b in 0..MAX_PROPERTIES_PER_ITEM;168 bench_init!{169 owner: sub; collection: collection(owner);170 owner: cross_from_sub;171 };172 let perms = (0..b).map(|k| PropertyKeyPermission {173 key: property_key(k as usize),174 permission: PropertyPermission {175 mutable: false,176 collection_admin: true,177 token_owner: true,178 },179 }).collect::<Vec<_>>();180 <Pallet<T>>::set_property_permissions(&collection, &owner, perms)?;181 let props = (0..b).map(|k| Property {182 key: property_key(k as usize),183 value: property_value(),184 }).collect::<Vec<_>>();185 let item = create_max_item(&collection, &owner, owner.clone())?;186 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props)?}187188 delete_token_properties {189 let b in 0..MAX_PROPERTIES_PER_ITEM;190 bench_init!{191 owner: sub; collection: collection(owner);192 owner: cross_from_sub;193 };194 let perms = (0..b).map(|k| PropertyKeyPermission {195 key: property_key(k as usize),196 permission: PropertyPermission {197 mutable: true,198 collection_admin: true,199 token_owner: true,200 },201 }).collect::<Vec<_>>();202 <Pallet<T>>::set_property_permissions(&collection, &owner, perms)?;203 let props = (0..b).map(|k| Property {204 key: property_key(k as usize),205 value: property_value(),206 }).collect::<Vec<_>>();207 let item = create_max_item(&collection, &owner, owner.clone())?;208 <Pallet<T>>::set_token_properties(&collection, &owner, item, props)?;209 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();210 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete)?}211}pallets/proxy-rmrk-core/src/benchmarking.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/proxy-rmrk-core/src/benchmarking.rs
@@ -0,0 +1,26 @@
+use sp_std::vec;
+
+use frame_benchmarking::{benchmarks, account};
+use frame_system::RawOrigin;
+use frame_support::{
+ traits::{Currency, Get},
+ BoundedVec,
+};
+
+use crate::{Config, Pallet, Call};
+
+const SEED: u32 = 1;
+
+fn create_data<S: Get<u32>>() -> BoundedVec<u8, S> {
+ vec![0; S::get() as usize].try_into().expect("size == S")
+}
+
+benchmarks! {
+ create_collection {
+ let caller = account("caller", 0, SEED);
+ <T as pallet_common::Config>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+ let metadata = create_data();
+ // TODO: Fix CollectionTokenPrefixLimitExceeded with create_data
+ let symbol = vec![].try_into().expect("0 <= x");
+ }: _(RawOrigin::Signed(caller), metadata, None, symbol)
+}
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -31,9 +31,15 @@
pub use pallet::*;
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarking;
pub mod misc;
pub mod property;
+pub mod weights;
+
+pub type SelfWeightOf<T> = <T as Config>::WeightInfo;
+use weights::WeightInfo;
use misc::*;
pub use property::*;
@@ -51,6 +57,7 @@
frame_system::Config + pallet_common::Config + pallet_nonfungible::Config + account::Config
{
type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
+ type WeightInfo: WeightInfo;
}
#[pallet::storage]
@@ -169,7 +176,7 @@
#[pallet::call]
impl<T: Config> Pallet<T> {
- #[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
+ #[pallet::weight(<SelfWeightOf<T>>::create_collection())]
#[transactional]
pub fn create_collection(
origin: OriginFor<T>,
pallets/proxy-rmrk-core/src/weights.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/proxy-rmrk-core/src/weights.rs
@@ -0,0 +1,74 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+
+//! Autogenerated weights for pallet_proxy_rmrk_core
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2022-06-09, STEPS: `50`, REPEAT: 200, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
+
+// Executed Command:
+// target/release/unique-collator
+// benchmark
+// pallet
+// --pallet
+// pallet-proxy-rmrk-core
+// --wasm-execution
+// compiled
+// --extrinsic
+// *
+// --template
+// .maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=200
+// --heap-pages=4096
+// --output=./pallets/proxy-rmrk-core/src/weights.rs
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(clippy::unnecessary_cast)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_proxy_rmrk_core.
+pub trait WeightInfo {
+ fn create_collection() -> Weight;
+}
+
+/// Weights for pallet_proxy_rmrk_core using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ // Storage: Common CreatedCollectionCount (r:1 w:1)
+ // Storage: Common DestroyedCollectionCount (r:1 w:0)
+ // Storage: System Account (r:2 w:2)
+ // Storage: RmrkCore CollectionIndex (r:1 w:1)
+ // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
+ // Storage: Common CollectionById (r:0 w:1)
+ // Storage: RmrkCore UniqueCollectionId (r:0 w:1)
+ // Storage: RmrkCore RmrkInernalCollectionId (r:0 w:1)
+ fn create_collection() -> Weight {
+ (76_647_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(5 as Weight))
+ .saturating_add(T::DbWeight::get().writes(9 as Weight))
+ }
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ // Storage: Common CreatedCollectionCount (r:1 w:1)
+ // Storage: Common DestroyedCollectionCount (r:1 w:0)
+ // Storage: System Account (r:2 w:2)
+ // Storage: RmrkCore CollectionIndex (r:1 w:1)
+ // Storage: Common CollectionPropertyPermissions (r:0 w:1)
+ // Storage: Common CollectionProperties (r:0 w:1)
+ // Storage: Common CollectionById (r:0 w:1)
+ // Storage: RmrkCore UniqueCollectionId (r:0 w:1)
+ // Storage: RmrkCore RmrkInernalCollectionId (r:0 w:1)
+ fn create_collection() -> Weight {
+ (76_647_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(5 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(9 as Weight))
+ }
+}
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -827,6 +827,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_proxy_rmrk_core, RmrkCore);
// list_benchmark!(list, extra, pallet_evm_coder_substrate, EvmCoderSubstrate);
let storage_info = AllPalletsReversedWithSystemFirst::storage_info();
@@ -870,6 +871,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_proxy_rmrk_core, RmrkCore);
// add_benchmark!(params, batches, pallet_evm_coder_substrate, EvmCoderSubstrate);
if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -919,6 +919,7 @@
}
impl pallet_proxy_rmrk_core::Config for Runtime {
+ type WeightInfo = pallet_proxy_rmrk_core::weights::SubstrateWeight<Self>;
type Event = Event;
}
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -918,6 +918,7 @@
}
impl pallet_proxy_rmrk_core::Config for Runtime {
+ type WeightInfo = pallet_proxy_rmrk_core::weights::SubstrateWeight<Self>;
type Event = Event;
}
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -917,6 +917,7 @@
}
impl pallet_proxy_rmrk_core::Config for Runtime {
+ type WeightInfo = pallet_proxy_rmrk_core::weights::SubstrateWeight<Self>;
type Event = Event;
}