difftreelog
fix benchmarks
in: master
5 files changed
pallets/common/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -33,7 +33,7 @@
MAX_COLLECTION_NAME_LENGTH, MAX_PROPERTIES_PER_ITEM, MAX_TOKEN_PREFIX_LENGTH,
};
-use crate::{BenchmarkPropertyWriter, CollectionHandle, Config, Pallet};
+use crate::{BenchmarkPropertyWriter, CollectionHandle, CollectionIssuer, Config, Pallet};
const SEED: u32 = 1;
@@ -121,7 +121,7 @@
owner,
CollectionMode::NFT,
|owner: T::CrossAccountId, data| {
- <Pallet<T>>::init_collection(owner.clone(), Some(owner), false, data)
+ <Pallet<T>>::init_collection(owner.clone(), CollectionIssuer::User(owner), data)
},
|h| h,
)
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -15,7 +15,9 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use frame_benchmarking::{account, v2::*};
-use pallet_common::{bench_init, benchmarking::create_collection_raw, Pallet as PalletCommon};
+use pallet_common::{
+ bench_init, benchmarking::create_collection_raw, CollectionIssuer, Pallet as PalletCommon,
+};
use sp_std::prelude::*;
use up_data_structs::{budget::Unlimited, CollectionMode, MAX_ITEMS_PER_BATCH};
@@ -31,7 +33,7 @@
owner,
CollectionMode::Fungible(0),
|owner: T::CrossAccountId, data| {
- <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
+ <PalletCommon<T>>::init_collection(owner.clone(), CollectionIssuer::User(owner), data)
},
FungibleHandle::cast,
)
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -18,7 +18,7 @@
use pallet_common::{
bench_init,
benchmarking::{create_collection_raw, property_key, property_value},
- Pallet as PalletCommon,
+ CollectionIssuer, Pallet as PalletCommon,
};
use sp_std::prelude::*;
use up_data_structs::{
@@ -58,7 +58,7 @@
owner,
CollectionMode::NFT,
|owner: T::CrossAccountId, data| {
- <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)
+ <PalletCommon<T>>::init_collection(owner.clone(), CollectionIssuer::User(owner), data)
},
NonfungibleHandle::cast,
)
pallets/refungible/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 core::{convert::TryInto, iter::IntoIterator};1819use frame_benchmarking::v2::*;20use pallet_common::{21 bench_init,22 benchmarking::{create_collection_raw, property_key, property_value},23 Pallet as PalletCommon,24};25use sp_std::prelude::*;26use up_data_structs::{27 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,28 MAX_PROPERTIES_PER_ITEM,29};3031use super::*;32use crate::{Config, Pallet, RefungibleHandle};3334const SEED: u32 = 1;3536fn create_max_item_data<T: Config>(37 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,38) -> CreateItemData<T> {39 CreateItemData::<T> {40 users: users41 .into_iter()42 .collect::<BTreeMap<_, _>>()43 .try_into()44 .unwrap(),45 properties: Default::default(),46 }47}4849fn create_max_item<T: Config>(50 collection: &RefungibleHandle<T>,51 sender: &T::CrossAccountId,52 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,53) -> Result<TokenId, DispatchError> {54 let data: CreateItemData<T> = create_max_item_data::<T>(users);55 <Pallet<T>>::create_item(collection, sender, data, &Unlimited)?;56 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))57}5859fn create_collection<T: Config>(60 owner: T::CrossAccountId,61) -> Result<RefungibleHandle<T>, DispatchError> {62 create_collection_raw(63 owner,64 CollectionMode::ReFungible,65 |owner: T::CrossAccountId, data| {66 <PalletCommon<T>>::init_collection(owner.clone(), Some(owner), false, data)67 },68 RefungibleHandle::cast,69 )70}7172#[benchmarks]73mod benchmarks {74 use super::*;7576 #[benchmark]77 fn create_item() -> Result<(), BenchmarkError> {78 bench_init! {79 owner: sub; collection: collection(owner);80 sender: cross_from_sub(owner); to: cross_sub;81 };8283 #[block]84 {85 create_max_item(&collection, &sender, [(to, 200)])?;86 }8788 Ok(())89 }9091 #[benchmark]92 fn create_multiple_items(b: Linear<0, MAX_ITEMS_PER_BATCH>) -> Result<(), BenchmarkError> {93 bench_init! {94 owner: sub; collection: collection(owner);95 sender: cross_from_sub(owner); to: cross_sub;96 };97 let data = (0..b)98 .map(|_| create_max_item_data::<T>([(to.clone(), 200)]))99 .collect();100101 #[block]102 {103 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;104 }105106 Ok(())107 }108 #[benchmark]109 fn create_multiple_items_ex_multiple_items(110 b: Linear<0, MAX_ITEMS_PER_BATCH>,111 ) -> Result<(), BenchmarkError> {112 bench_init! {113 owner: sub; collection: collection(owner);114 sender: cross_from_sub(owner);115 };116 let data = (0..b)117 .map(|t| {118 bench_init!(to: cross_sub(t););119 create_max_item_data::<T>([(to, 200)])120 })121 .collect();122123 #[block]124 {125 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;126 }127128 Ok(())129 }130131 #[benchmark]132 fn create_multiple_items_ex_multiple_owners(133 b: Linear<0, MAX_ITEMS_PER_BATCH>,134 ) -> Result<(), BenchmarkError> {135 bench_init! {136 owner: sub; collection: collection(owner);137 sender: cross_from_sub(owner);138 };139 let data = vec![create_max_item_data::<T>((0..b).map(|u| {140 bench_init!(to: cross_sub(u););141 (to, 200)142 }))];143144 #[block]145 {146 <Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?;147 }148149 Ok(())150 }151152 // Other user left, token data is kept153 #[benchmark]154 fn burn_item_partial() -> Result<(), BenchmarkError> {155 bench_init! {156 owner: sub; collection: collection(owner);157 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;158 };159 let item = create_max_item(160 &collection,161 &sender,162 [(burner.clone(), 200), (another_owner, 200)],163 )?;164165 #[block]166 {167 <Pallet<T>>::burn(&collection, &burner, item, 200)?;168 }169170 Ok(())171 }172173 // No users remaining, token is destroyed174 #[benchmark]175 fn burn_item_fully() -> Result<(), BenchmarkError> {176 bench_init! {177 owner: sub; collection: collection(owner);178 sender: cross_from_sub(owner); burner: cross_sub;179 };180 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;181182 #[block]183 {184 <Pallet<T>>::burn(&collection, &burner, item, 200)?;185 }186187 Ok(())188 }189190 #[benchmark]191 fn transfer_normal() -> Result<(), BenchmarkError> {192 bench_init! {193 owner: sub; collection: collection(owner);194 sender: cross_from_sub(owner); receiver: cross_sub;195 };196 let item = create_max_item(197 &collection,198 &sender,199 [(sender.clone(), 200), (receiver.clone(), 200)],200 )?;201202 #[block]203 {204 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;205 }206207 Ok(())208 }209210 // Target account is created211 #[benchmark]212 fn transfer_creating() -> Result<(), BenchmarkError> {213 bench_init! {214 owner: sub; collection: collection(owner);215 sender: cross_from_sub(owner); receiver: cross_sub;216 };217 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;218219 #[block]220 {221 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?;222 }223224 Ok(())225 }226227 // Source account is destroyed228 #[benchmark]229 fn transfer_removing() -> Result<(), BenchmarkError> {230 bench_init! {231 owner: sub; collection: collection(owner);232 sender: cross_from_sub(owner); receiver: cross_sub;233 };234 let item = create_max_item(235 &collection,236 &sender,237 [(sender.clone(), 200), (receiver.clone(), 200)],238 )?;239240 #[block]241 {242 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;243 }244245 Ok(())246 }247248 // Source account destroyed, target created249 #[benchmark]250 fn transfer_creating_removing() -> Result<(), BenchmarkError> {251 bench_init! {252 owner: sub; collection: collection(owner);253 sender: cross_from_sub(owner); receiver: cross_sub;254 };255 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;256257 #[block]258 {259 <Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?;260 }261262 Ok(())263 }264265 #[benchmark]266 fn approve() -> Result<(), BenchmarkError> {267 bench_init! {268 owner: sub; collection: collection(owner);269 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;270 };271 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;272273 #[block]274 {275 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;276 }277278 Ok(())279 }280281 #[benchmark]282 fn approve_from() -> Result<(), BenchmarkError> {283 bench_init! {284 owner: sub; collection: collection(owner);285 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;286 };287 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());288 let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;289290 #[block]291 {292 <Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?;293 }294295 Ok(())296 }297298 #[benchmark]299 fn transfer_from_normal() -> Result<(), BenchmarkError> {300 bench_init! {301 owner: sub; collection: collection(owner);302 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;303 };304 let item = create_max_item(305 &collection,306 &owner,307 [(sender.clone(), 200), (receiver.clone(), 200)],308 )?;309 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;310311 #[block]312 {313 <Pallet<T>>::transfer_from(314 &collection,315 &spender,316 &sender,317 &receiver,318 item,319 100,320 &Unlimited,321 )?;322 }323324 Ok(())325 }326327 // Target account is created328 #[benchmark]329 fn transfer_from_creating() -> Result<(), BenchmarkError> {330 bench_init! {331 owner: sub; collection: collection(owner);332 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;333 };334 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;335 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;336337 #[block]338 {339 <Pallet<T>>::transfer_from(340 &collection,341 &spender,342 &sender,343 &receiver,344 item,345 100,346 &Unlimited,347 )?;348 }349350 Ok(())351 }352353 // Source account is destroyed354 #[benchmark]355 fn transfer_from_removing() -> Result<(), BenchmarkError> {356 bench_init! {357 owner: sub; collection: collection(owner);358 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;359 };360 let item = create_max_item(361 &collection,362 &owner,363 [(sender.clone(), 200), (receiver.clone(), 200)],364 )?;365 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;366367 #[block]368 {369 <Pallet<T>>::transfer_from(370 &collection,371 &spender,372 &sender,373 &receiver,374 item,375 200,376 &Unlimited,377 )?;378 }379380 Ok(())381 }382383 // Source account destroyed, target created384 #[benchmark]385 fn transfer_from_creating_removing() -> Result<(), BenchmarkError> {386 bench_init! {387 owner: sub; collection: collection(owner);388 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;389 };390 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;391 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;392393 #[block]394 {395 <Pallet<T>>::transfer_from(396 &collection,397 &spender,398 &sender,399 &receiver,400 item,401 200,402 &Unlimited,403 )?;404 }405406 Ok(())407 }408409 // Both source account and token is destroyed410 #[benchmark]411 fn burn_from() -> Result<(), BenchmarkError> {412 bench_init! {413 owner: sub; collection: collection(owner);414 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;415 };416 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;417 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;418419 #[block]420 {421 <Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?;422 }423424 Ok(())425 }426427 #[benchmark]428 fn load_token_properties() -> Result<(), BenchmarkError> {429 bench_init! {430 owner: sub; collection: collection(owner);431 owner: cross_from_sub;432 };433434 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;435436 #[block]437 {438 pallet_common::BenchmarkPropertyWriter::<T>::load_token_properties(&collection, item);439 }440441 Ok(())442 }443444 #[benchmark]445 fn write_token_properties(b: Linear<0, MAX_PROPERTIES_PER_ITEM>) -> Result<(), BenchmarkError> {446 bench_init! {447 owner: sub; collection: collection(owner);448 owner: cross_from_sub;449 };450451 let perms = (0..b)452 .map(|k| PropertyKeyPermission {453 key: property_key(k as usize),454 permission: PropertyPermission {455 mutable: false,456 collection_admin: true,457 token_owner: true,458 },459 })460 .collect::<Vec<_>>();461 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;462 let props = (0..b)463 .map(|k| Property {464 key: property_key(k as usize),465 value: property_value(),466 })467 .collect::<Vec<_>>();468 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;469470 let lazy_collection_info =471 pallet_common::BenchmarkPropertyWriter::<T>::load_collection_info(&collection, &owner);472473 #[block]474 {475 let mut property_writer =476 pallet_common::BenchmarkPropertyWriter::new(&collection, lazy_collection_info);477478 property_writer.write_token_properties(479 item,480 props.into_iter(),481 crate::erc::ERC721TokenEvent::TokenChanged {482 token_id: item.into(),483 }484 .to_log(T::ContractAddress::get()),485 )?;486 }487488 Ok(())489 }490491 #[benchmark]492 fn set_token_property_permissions(493 b: Linear<0, MAX_PROPERTIES_PER_ITEM>,494 ) -> Result<(), BenchmarkError> {495 bench_init! {496 owner: sub; collection: collection(owner);497 owner: cross_from_sub;498 };499 let perms = (0..b)500 .map(|k| PropertyKeyPermission {501 key: property_key(k as usize),502 permission: PropertyPermission {503 mutable: false,504 collection_admin: false,505 token_owner: false,506 },507 })508 .collect::<Vec<_>>();509510 #[block]511 {512 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;513 }514515 Ok(())516 }517518 #[benchmark]519 fn repartition_item() -> Result<(), BenchmarkError> {520 bench_init! {521 owner: sub; collection: collection(owner);522 sender: cross_from_sub(owner); owner: cross_sub;523 };524 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;525526 #[block]527 {528 <Pallet<T>>::repartition(&collection, &owner, item, 200)?;529 }530531 Ok(())532 }533534 #[benchmark]535 fn set_allowance_for_all() -> Result<(), BenchmarkError> {536 bench_init! {537 owner: sub; collection: collection(owner); owner: cross_from_sub;538 operator: cross_sub;539 };540541 #[block]542 {543 <Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?;544 }545546 Ok(())547 }548549 #[benchmark]550 fn allowance_for_all() -> Result<(), BenchmarkError> {551 bench_init! {552 owner: sub; collection: collection(owner); owner: cross_from_sub;553 operator: cross_sub;554 };555556 #[block]557 {558 <Pallet<T>>::allowance_for_all(&collection, &owner, &operator);559 }560561 Ok(())562 }563564 #[benchmark]565 fn repair_item() -> Result<(), BenchmarkError> {566 bench_init! {567 owner: sub; collection: collection(owner);568 owner: cross_from_sub;569 };570 let item = create_max_item(&collection, &owner, [(owner.clone(), 100)])?;571572 #[block]573 {574 <Pallet<T>>::repair_item(&collection, item)?;575 }576577 Ok(())578 }579}pallets/structure/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -16,7 +16,7 @@
use frame_benchmarking::v2::{account, benchmarks, BenchmarkError};
use frame_support::traits::{fungible::Balanced, tokens::Precision, Get};
-use pallet_common::Config as CommonConfig;
+use pallet_common::{CollectionIssuer, Config as CommonConfig};
use pallet_evm::account::CrossAccountId;
use sp_std::vec;
use up_data_structs::{
@@ -44,7 +44,7 @@
.unwrap();
T::CollectionDispatch::create(
caller_cross.clone(),
- Some(caller_cross.clone()),
+ CollectionIssuer::User(caller_cross.clone()),
CreateCollectionData {
mode: CollectionMode::NFT,
..Default::default()