difftreelog
fix(foreign-assets) make benchmarks do updates
in: master
6 files changed
pallets/app-promotion/Cargo.tomldiffbeforeafterboth--- a/pallets/app-promotion/Cargo.toml
+++ b/pallets/app-promotion/Cargo.toml
@@ -66,8 +66,6 @@
pallet-common ={ default-features = false, path = "../common" }
pallet-unique ={ default-features = false, path = "../unique" }
pallet-evm-contract-helpers ={ default-features = false, path = "../evm-contract-helpers" }
-
-[dev-dependencies]
pallet-evm-migration ={ default-features = false, path = "../evm-migration" }
################################################################################
pallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -20,11 +20,10 @@
use crate::Pallet as PromototionPallet;
use sp_runtime::traits::Bounded;
-use sp_std::vec;
use frame_benchmarking::{benchmarks, account};
use frame_support::traits::OnInitialize;
-use frame_system::{Origin, RawOrigin};
+use frame_system::RawOrigin;
use pallet_unique::benchmarking::create_nft_collection;
use pallet_evm_migration::Pallet as EvmMigrationPallet;
pallets/common/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 sp_std::vec::Vec;18use crate::{Config, CollectionHandle, Pallet};19use pallet_evm::account::CrossAccountId;20use frame_benchmarking::{benchmarks, account};21use up_data_structs::{22 CollectionMode, CreateCollectionData, CollectionId, Property, PropertyKey, PropertyValue,23 CollectionPermissions, NestingPermissions, MAX_COLLECTION_NAME_LENGTH,24 MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, MAX_PROPERTIES_PER_ITEM,25};26use frame_support::{27 traits::{Currency, Get},28 pallet_prelude::ConstU32,29 BoundedVec,30};31use core::convert::TryInto;32use sp_runtime::DispatchError;3334const SEED: u32 = 1;3536pub fn create_data<const S: u32>() -> BoundedVec<u8, ConstU32<S>> {37 create_var_data::<S>(S)38}39pub fn create_u16_data<const S: u32>() -> BoundedVec<u16, ConstU32<S>> {40 (0..S)41 .map(|v| (v & 0xffff) as u16)42 .collect::<Vec<_>>()43 .try_into()44 .unwrap()45}46pub fn create_var_data<const S: u32>(size: u32) -> BoundedVec<u8, ConstU32<S>> {47 assert!(48 size <= S,49 "size ({}) should be less within bound ({})",50 size,51 S52 );53 (0..size)54 .map(|v| (v & 0xff) as u8)55 .collect::<Vec<_>>()56 .try_into()57 .unwrap()58}59pub fn property_key(id: usize) -> PropertyKey {60 #[cfg(not(feature = "std"))]61 use alloc::string::ToString;62 let mut data = create_data();63 // No DerefMut available for .fill64 for i in 0..data.len() {65 data[i] = b'0';66 }67 let bytes = id.to_string();68 let len = data.len();69 data[len - bytes.len()..].copy_from_slice(&bytes.as_bytes());70 data71}72pub fn property_value() -> PropertyValue {73 create_data()74}7576pub fn create_collection_raw<T: Config, R>(77 owner: T::CrossAccountId,78 mode: CollectionMode,79 handler: impl FnOnce(80 T::CrossAccountId,81 CreateCollectionData<T::AccountId>,82 ) -> Result<CollectionId, DispatchError>,83 cast: impl FnOnce(CollectionHandle<T>) -> R,84) -> Result<R, DispatchError> {85 <T as Config>::Currency::deposit_creating(&owner.as_sub(), T::CollectionCreationPrice::get());86 let name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();87 let description = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();88 let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();89 handler(90 owner,91 CreateCollectionData {92 mode,93 name,94 description,95 token_prefix,96 permissions: Some(CollectionPermissions {97 nesting: Some(NestingPermissions {98 token_owner: false,99 collection_admin: false,100 restricted: None,101 #[cfg(feature = "runtime-benchmarks")]102 permissive: true,103 }),104 mint_mode: Some(true),105 ..Default::default()106 }),107 ..Default::default()108 },109 )110 .and_then(CollectionHandle::try_get)111 .map(cast)112}113fn create_collection<T: Config>(114 owner: T::CrossAccountId,115) -> Result<CollectionHandle<T>, DispatchError> {116 create_collection_raw(117 owner,118 CollectionMode::NFT,119 |owner, data| <Pallet<T>>::init_collection(owner, data, true),120 |h| h,121 )122}123124/// Helper macros, which handles all benchmarking preparation in semi-declarative way125///126/// `name` is a substrate account127/// - name: sub[(id)]128/// `name` is a collection with owner `owner`129/// - name: collection(owner)130/// `name` is a cross account based on substrate131/// - name: cross_sub[(id)]132/// `name` is a cross account, which maps to substrate account `name`133/// - name: cross_from_sub134/// `name` is a cross account, which maps to substrate account `other_name`135/// - name: cross_from_sub(other_name)136#[macro_export]137macro_rules! bench_init {138 ($name:ident: sub $(($id:expr))?; $($rest:tt)*) => {139 let $name: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);140 bench_init!($($rest)*);141 };142 ($name:ident: collection($owner:ident); $($rest:tt)*) => {143 let $name = create_collection::<T>(T::CrossAccountId::from_sub($owner.clone()))?;144 bench_init!($($rest)*);145 };146 ($name:ident: cross; $($rest:tt)*) => {147 let $name = T::CrossAccountId::from_sub($name);148 bench_init!($($rest)*);149 };150 ($name:ident: cross_sub $(($id:expr))?; $($rest:tt)*) => {151 let account: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);152 let $name = T::CrossAccountId::from_sub(account);153 bench_init!($($rest)*);154 };155 ($name:ident: cross_from_sub; $($rest:tt)*) => {156 let $name = T::CrossAccountId::from_sub($name);157 bench_init!($($rest)*);158 };159 ($name:ident: cross_from_sub($from:ident); $($rest:tt)*) => {160 let $name = T::CrossAccountId::from_sub($from);161 bench_init!($($rest)*);162 };163 () => {}164}165166benchmarks! {167 set_collection_properties {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 props = (0..b).map(|p| Property {174 key: property_key(p as usize),175 value: property_value(),176 }).collect::<Vec<_>>();177 }: {<Pallet<T>>::set_collection_properties(&collection, &owner, props)?}178179 delete_collection_properties {180 let b in 0..MAX_PROPERTIES_PER_ITEM;181 bench_init!{182 owner: sub; collection: collection(owner);183 owner: cross_from_sub;184 };185 let props = (0..b).map(|p| Property {186 key: property_key(p as usize),187 value: property_value(),188 }).collect::<Vec<_>>();189 <Pallet<T>>::set_collection_properties(&collection, &owner, props)?;190 let to_delete = (0..b).map(|p| property_key(p as usize)).collect::<Vec<_>>();191 }: {<Pallet<T>>::delete_collection_properties(&collection, &owner, to_delete)?}192}pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -346,7 +346,7 @@
use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};
use frame_system::pallet_prelude::*;
use frame_support::traits::Currency;
- use up_data_structs::{TokenId, mapping::TokenAddressMapping, CollectionFlags};
+ use up_data_structs::{TokenId, mapping::TokenAddressMapping};
use scale_info::TypeInfo;
use weights::WeightInfo;
pallets/foreign-assets/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/benchmarking.rs
+++ b/pallets/foreign-assets/src/benchmarking.rs
@@ -16,11 +16,10 @@
#![allow(missing_docs)]
-use super::{Config, Pallet};
+use super::{Config, Pallet, Call};
use frame_benchmarking::{benchmarks, account};
use frame_system::RawOrigin;
use crate::AssetMetadata;
-use crate::Pallet as ForeignAssets;
use xcm::opaque::latest::Junction::Parachain;
use xcm::VersionedMultiLocation;
use frame_support::{
@@ -30,7 +29,6 @@
benchmarks! {
register_foreign_asset {
- let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;
let owner: T::AccountId = account("user", 0, 1);
let location: VersionedMultiLocation = VersionedMultiLocation::from(Parachain(1000).into());
let metadata: AssetMetadata<<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance> = AssetMetadata{
@@ -44,12 +42,9 @@
balance = balance * balance;
<T as Config>::Currency::make_free_balance_be(&owner,
balance);
- }: {
- ForeignAssets::<T>::register_foreign_asset(origin.into(), owner, Box::new(location), Box::new(metadata))?
- }
+ }: _(RawOrigin::Root, owner, Box::new(location), Box::new(metadata))
update_foreign_asset {
- let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;
let owner: T::AccountId = account("user", 0, 1);
let location: VersionedMultiLocation = VersionedMultiLocation::from(Parachain(2000).into());
let metadata: AssetMetadata<<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance> = AssetMetadata{
@@ -68,9 +63,6 @@
4_000_000_000u32.into();
balance = balance * balance;
<T as Config>::Currency::make_free_balance_be(&owner, balance);
- ForeignAssets::<T>::register_foreign_asset(origin.clone().into(), owner, Box::new(location.clone()), Box::new(metadata))?;
-
- }: {
- ForeignAssets::<T>::update_foreign_asset(origin.into(), 0, Box::new(location), Box::new(metadata2))?
- }
+ Pallet::<T>::register_foreign_asset(RawOrigin::Root.into(), owner, Box::new(location.clone()), Box::new(metadata))?;
+ }: _(RawOrigin::Root, 0, Box::new(location), Box::new(metadata2))
}
pallets/foreign-assets/src/weights.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/weights.rs
+++ b/pallets/foreign-assets/src/weights.rs
@@ -1,43 +1,94 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+//! Autogenerated weights for pallet_foreign_assets
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2022-09-16, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
+
+// Executed Command:
+// target/release/unique-collator
+// benchmark
+// pallet
+// --pallet
+// pallet-foreign-assets
+// --wasm-execution
+// compiled
+// --extrinsic
+// *
+// --template
+// .maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=80
+// --heap-pages=4096
+// --output=./pallets/foreign-assets/src/weights.rs
+
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
+#![allow(missing_docs)]
#![allow(clippy::unnecessary_cast)]
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use sp_std::marker::PhantomData;
-/// Weight functions needed for module_asset_registry.
+/// Weight functions needed for pallet_foreign_assets.
pub trait WeightInfo {
fn register_foreign_asset() -> Weight;
fn update_foreign_asset() -> Weight;
}
-/// Weights for pallet_fungible using the Substrate node and recommended hardware.
+/// Weights for pallet_foreign_assets 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: ForeignAssets NextForeignAssetId (r:1 w:1)
+ // Storage: ForeignAssets LocationToCurrencyIds (r:1 w:1)
+ // Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
+ // Storage: ForeignAssets AssetMetadatas (r:1 w:1)
+ // Storage: ForeignAssets AssetBinding (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)
fn register_foreign_asset() -> Weight {
- (29_819_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ (52_161_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(9 as Weight))
+ .saturating_add(T::DbWeight::get().writes(11 as Weight))
}
+ // Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
+ // Storage: ForeignAssets AssetMetadatas (r:1 w:1)
fn update_foreign_asset() -> Weight {
- (25_119_000 as Weight)
- .saturating_add(T::DbWeight::get().reads(1 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ (19_111_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 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: ForeignAssets NextForeignAssetId (r:1 w:1)
+ // Storage: ForeignAssets LocationToCurrencyIds (r:1 w:1)
+ // Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
+ // Storage: ForeignAssets AssetMetadatas (r:1 w:1)
+ // Storage: ForeignAssets AssetBinding (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)
fn register_foreign_asset() -> Weight {
- (29_819_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(2 as Weight))
- .saturating_add(RocksDbWeight::get().writes(3 as Weight))
+ (52_161_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(9 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(11 as Weight))
}
+ // Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
+ // Storage: ForeignAssets AssetMetadatas (r:1 w:1)
fn update_foreign_asset() -> Weight {
- (25_119_000 as Weight)
- .saturating_add(RocksDbWeight::get().reads(1 as Weight))
- .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ (19_111_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(2 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
-}
\ No newline at end of file
+}