difftreelog
refactor impl of `transfer` `transfer_from` functions, bencmarks for `Common` & `NFT` pallets
in: master
7 files changed
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -215,17 +215,9 @@
true,
)?;
- <Pallet<T>>::toggle_allowlist(
- &collection,
- &sender,
- &receiver,
- true,
- )?;
-
assert_eq!(collection_handle.permissions.access(), AccessMode::AllowList);
collection_handle.check_allowlist(&sender)?;
- collection_handle.check_allowlist(&receiver)?;
}: {collection_handle.check_allowlist(&sender)?;}
}
pallets/common/src/helpers.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/common/src/helpers.rs
@@ -0,0 +1,30 @@
+//! # Helpers module
+//!
+//! The module contains helpers.
+//!
+use frame_support::{
+ pallet_prelude::DispatchResultWithPostInfo,
+ weights::Weight,
+ dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo},
+};
+
+/// Add weight for a `DispatchResultWithPostInfo`
+///
+/// - `target`: DispatchResultWithPostInfo to which weight will be added
+/// - `additional_weight`: Weight to be added
+pub fn add_weight_to_post_info(target: &mut DispatchResultWithPostInfo, additional_weight: Weight) {
+ match target {
+ Ok(PostDispatchInfo {
+ actual_weight: Some(weight),
+ ..
+ })
+ | Err(DispatchErrorWithPostInfo {
+ post_info: PostDispatchInfo {
+ actual_weight: Some(weight),
+ ..
+ },
+ ..
+ }) => *weight += additional_weight,
+ _ => {}
+ }
+}
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -92,9 +92,9 @@
pub mod dispatch;
pub mod erc;
pub mod eth;
+pub mod helpers;
#[allow(missing_docs)]
pub mod weights;
-
/// Weight info.
pub type SelfWeightOf<T> = <T as Config>::WeightInfo;
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 frame_benchmarking::{benchmarks, account};21use pallet_common::{22 bench_init,23 benchmarking::{create_collection_raw, property_key, property_value},24 CommonCollectionOperations,25};26use sp_std::prelude::*;27use up_data_structs::{28 CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited,29 PropertyPermission,30};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 <Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())62 },63 NonfungibleHandle::cast,64 )65}6667benchmarks! {68 create_item {69 bench_init!{70 owner: sub; collection: collection(owner);71 sender: cross_from_sub(owner); to: cross_sub;72 };73 }: {create_max_item(&collection, &sender, to.clone())?}7475 create_multiple_items {76 let b in 0..MAX_ITEMS_PER_BATCH;77 bench_init!{78 owner: sub; collection: collection(owner);79 sender: cross_from_sub(owner); to: cross_sub;80 };81 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();82 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8384 create_multiple_items_ex {85 let b in 0..MAX_ITEMS_PER_BATCH;86 bench_init!{87 owner: sub; collection: collection(owner);88 sender: cross_from_sub(owner);89 };90 let data = (0..b).map(|i| {91 bench_init!(to: cross_sub(i););92 create_max_item_data::<T>(to)93 }).collect();94 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9596 burn_item {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(&collection, &burner, item)?}103104 burn_recursively_self_raw {105 bench_init!{106 owner: sub; collection: collection(owner);107 sender: cross_from_sub(owner); burner: cross_sub;108 };109 let item = create_max_item(&collection, &sender, burner.clone())?;110 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}111112 burn_recursively_breadth_plus_self_plus_self_per_each_raw {113 let b in 0..200;114 bench_init!{115 owner: sub; collection: collection(owner);116 sender: cross_from_sub(owner); burner: cross_sub;117 };118 let item = create_max_item(&collection, &sender, burner.clone())?;119 for i in 0..b {120 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;121 }122 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}123124 transfer {125 bench_init!{126 owner: sub; collection: collection(owner);127 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;128 };129 let item = create_max_item(&collection, &owner, sender.clone())?;130 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}131132 approve {133 bench_init!{134 owner: sub; collection: collection(owner);135 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;136 };137 let item = create_max_item(&collection, &owner, sender.clone())?;138 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}139140 approve_from {141 bench_init!{142 owner: sub; collection: collection(owner);143 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;144 };145 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());146 let item = create_max_item(&collection, &owner, owner_eth.clone())?;147 }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}148149 checks_for_transfer_from {150 bench_init!{151 owner: sub; collection: collection(owner);152 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;153 };154 let item = create_max_item(&collection, &owner, sender.clone())?;155 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;156 }: {<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?}157158 burn_from {159 bench_init!{160 owner: sub; collection: collection(owner);161 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;162 };163 let item = create_max_item(&collection, &owner, sender.clone())?;164 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;165 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}166167 set_token_property_permissions {168 let b in 0..MAX_PROPERTIES_PER_ITEM;169 bench_init!{170 owner: sub; collection: collection(owner);171 owner: cross_from_sub;172 };173 let perms = (0..b).map(|k| PropertyKeyPermission {174 key: property_key(k as usize),175 permission: PropertyPermission {176 mutable: false,177 collection_admin: false,178 token_owner: false,179 },180 }).collect::<Vec<_>>();181 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}182183 set_token_properties {184 let b in 0..MAX_PROPERTIES_PER_ITEM;185 bench_init!{186 owner: sub; collection: collection(owner);187 owner: cross_from_sub;188 };189 let perms = (0..b).map(|k| PropertyKeyPermission {190 key: property_key(k as usize),191 permission: PropertyPermission {192 mutable: false,193 collection_admin: true,194 token_owner: true,195 },196 }).collect::<Vec<_>>();197 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;198 let props = (0..b).map(|k| Property {199 key: property_key(k as usize),200 value: property_value(),201 }).collect::<Vec<_>>();202 let item = create_max_item(&collection, &owner, owner.clone())?;203 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}204205 delete_token_properties {206 let b in 0..MAX_PROPERTIES_PER_ITEM;207 bench_init!{208 owner: sub; collection: collection(owner);209 owner: cross_from_sub;210 };211 let perms = (0..b).map(|k| PropertyKeyPermission {212 key: property_key(k as usize),213 permission: PropertyPermission {214 mutable: true,215 collection_admin: true,216 token_owner: true,217 },218 }).collect::<Vec<_>>();219 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;220 let props = (0..b).map(|k| Property {221 key: property_key(k as usize),222 value: property_value(),223 }).collect::<Vec<_>>();224 let item = create_max_item(&collection, &owner, owner.clone())?;225 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;226 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();227 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}228229 token_owner {230 bench_init!{231 owner: sub; collection: collection(owner);232 owner: cross_from_sub;233 };234 let item = create_max_item(&collection, &owner, owner.clone())?;235 }: {collection.token_owner(item).unwrap()}236237 set_allowance_for_all {238 bench_init!{239 owner: sub; collection: collection(owner); owner: cross_from_sub;240 operator: cross_sub;241 };242 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}243244 allowance_for_all {245 bench_init!{246 owner: sub; collection: collection(owner); owner: cross_from_sub;247 operator: cross_sub;248 };249 }: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}250251 repair_item {252 bench_init!{253 owner: sub; collection: collection(owner);254 owner: cross_from_sub;255 };256 let item = create_max_item(&collection, &owner, owner.clone())?;257 }: {<Pallet<T>>::repair_item(&collection, item)?}258}pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -103,7 +103,7 @@
}
fn transfer_from() -> Weight {
- Self::transfer() + <SelfWeightOf<T>>::checks_for_transfer_from()
+ Self::transfer() + <SelfWeightOf<T>>::checks_allowed_raw()
}
fn burn_from() -> Weight {
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -109,7 +109,7 @@
use pallet_common::{
Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,
- weights::WeightInfo as CommonWeightInfo,
+ weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info,
};
use pallet_structure::{Pallet as PalletStructure, Error as StructureError};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
@@ -809,14 +809,15 @@
<CommonError<T>>::TransferNotAllowed
);
+ let mut actual_weight = <SelfWeightOf<T>>::transfer();
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
ensure!(&token_data.owner == from, <CommonError<T>>::NoPermission);
- let is_allow_list_mode = collection.permissions.access() == AccessMode::AllowList;
- if is_allow_list_mode {
+ if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(from)?;
collection.check_allowlist(to)?;
+ actual_weight += <PalletCommonWeightOf<T>>::check_accesslist() * 2;
}
<PalletCommon<T>>::ensure_correct_receiver(to)?;
@@ -887,15 +888,8 @@
1,
));
- let actual_weight = match is_allow_list_mode {
- true => Some(
- <SelfWeightOf<T>>::transfer() + <PalletCommonWeightOf<T>>::check_accesslist() * 2,
- ),
- false => Some(<SelfWeightOf<T>>::transfer()),
- };
-
Ok(PostDispatchInfo {
- actual_weight,
+ actual_weight: Some(actual_weight),
pays_fee: Pays::Yes,
})
}
@@ -1247,12 +1241,9 @@
// =========
// Allowance is reset in [`transfer`]
- Self::transfer(collection, from, to, token, nesting_budget).map(|mut p| {
- p.actual_weight = Some(
- p.actual_weight.unwrap_or_default() + <SelfWeightOf<T>>::checks_for_transfer_from(),
- );
- p
- })
+ let mut result = Self::transfer(collection, from, to, token, nesting_budget);
+ add_weight_to_post_info(&mut result, <SelfWeightOf<T>>::checks_allowed_raw());
+ result
}
/// Burn NFT token for `from` account.
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -43,7 +43,7 @@
fn transfer() -> Weight;
fn approve() -> Weight;
fn approve_from() -> Weight;
- fn checks_for_transfer_from() -> Weight;
+ fn checks_allowed_raw() -> Weight;
fn burn_from() -> Weight;
fn set_token_property_permissions(b: u32, ) -> Weight;
fn set_token_properties(b: u32, ) -> Weight;
@@ -252,22 +252,10 @@
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
- /// Storage: Nonfungible Allowance (r:1 w:1)
- /// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenData (r:1 w:1)
- /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible AccountBalance (r:2 w:2)
- /// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible Owned (r:0 w:2)
- /// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
- fn transfer_from() -> Weight {
- // Proof Size summary in bytes:
- // Measured: `527`
- // Estimated: `10144`
- // Minimum execution time: 24_919_000 picoseconds.
- Weight::from_parts(25_333_000, 10144)
- .saturating_add(T::DbWeight::get().reads(4_u64))
- .saturating_add(T::DbWeight::get().writes(6_u64))
+ // Storage: Nonfungible Allowance (r:1 w:0)
+ fn checks_allowed_raw() -> Weight {
+ Weight::from_ref_time(3_341_000 as u64)
+ .saturating_add(T::DbWeight::get().reads(1 as u64))
}
/// Storage: Nonfungible Allowance (r:1 w:1)
/// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -578,22 +566,10 @@
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
- /// Storage: Nonfungible Allowance (r:1 w:1)
- /// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible TokenData (r:1 w:1)
- /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible AccountBalance (r:2 w:2)
- /// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible Owned (r:0 w:2)
- /// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
- fn transfer_from() -> Weight {
- // Proof Size summary in bytes:
- // Measured: `527`
- // Estimated: `10144`
- // Minimum execution time: 24_919_000 picoseconds.
- Weight::from_parts(25_333_000, 10144)
- .saturating_add(RocksDbWeight::get().reads(4_u64))
- .saturating_add(RocksDbWeight::get().writes(6_u64))
+ // Storage: Nonfungible Allowance (r:1 w:0)
+ fn checks_allowed_raw() -> Weight {
+ Weight::from_ref_time(3_341_000 as u64)
+ .saturating_add(RocksDbWeight::get().reads(1 as u64))
}
/// Storage: Nonfungible Allowance (r:1 w:1)
/// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)