difftreelog
test upgrade benchmarks for new substrate
in: master
12 files changed
.maintain/frame-weight-template.hbsdiffbeforeafterboth--- a/.maintain/frame-weight-template.hbs
+++ b/.maintain/frame-weight-template.hbs
@@ -7,7 +7,7 @@
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
// Executed Command:
-{{#each args as |arg|~}}
+{{#each args as |arg|}}
// {{arg}}
{{/each}}
@@ -21,76 +21,80 @@
/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
- {{~#each benchmarks as |benchmark|}}
+ {{#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
- {{~/each}}
+ {{/each}}
}
/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
+{{#if (eq pallet "frame_system")}}
+impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
+{{else}}
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
- {{~#each benchmarks as |benchmark|}}
- {{~#each benchmark.comments as |comment|}}
+{{/if}}
+ {{#each benchmarks as |benchmark|}}
+ {{#each benchmark.comments as |comment|}}
// {{comment}}
- {{~/each}}
+ {{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
- {{~#each benchmark.component_weight as |cw|}}
+ {{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
- {{~/each}}
- {{~#if (ne benchmark.base_reads "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_reads as |cr|}}
+ {{/if}}
+ {{#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
- {{~/each}}
- {{~#if (ne benchmark.base_writes "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_writes as |cw|}}
+ {{/if}}
+ {{#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
- {{~/each}}
+ {{/each}}
}
- {{~/each}}
+ {{/each}}
}
// For backwards compatibility and tests
impl WeightInfo for () {
- {{~#each benchmarks as |benchmark|}}
- {{~#each benchmark.comments as |comment|}}
+ {{#each benchmarks as |benchmark|}}
+ {{#each benchmark.comments as |comment|}}
// {{comment}}
- {{~/each}}
+ {{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
- {{~#each benchmark.component_weight as |cw|}}
+ {{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
- {{~/each}}
- {{~#if (ne benchmark.base_reads "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_reads as |cr|}}
+ {{/if}}
+ {{#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
- {{~/each}}
- {{~#if (ne benchmark.base_writes "0")}}
+ {{/each}}
+ {{#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
- {{~/if}}
- {{~#each benchmark.component_writes as |cw|}}
+ {{/if}}
+ {{#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
- {{~/each}}
+ {{/each}}
}
- {{~/each}}
+ {{/each}}
}
pallets/common/src/benchmarking.rsdiffbeforeafterboth1use sp_std::vec::Vec;2use crate::{Config, CollectionHandle};3use up_data_structs::{4 CollectionMode, Collection, CollectionId, MAX_COLLECTION_NAME_LENGTH,5 MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, OFFCHAIN_SCHEMA_LIMIT,6 VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT,7};8use frame_support::traits::{Currency, Get};9use core::convert::TryInto;10use sp_runtime::DispatchError;1112pub fn create_data(size: usize) -> Vec<u8> {13 (0..size).map(|v| (v & 0xff) as u8).collect()14}15pub fn create_u16_data(size: usize) -> Vec<u16> {16 (0..size).map(|v| (v & 0xffff) as u16).collect()17}1819pub fn create_collection_raw<T: Config, R>(20 owner: T::AccountId,21 mode: CollectionMode,22 handler: impl FnOnce(Collection<T::AccountId>) -> Result<CollectionId, DispatchError>,23 cast: impl FnOnce(CollectionHandle<T>) -> R,24) -> Result<R, DispatchError> {25 T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());26 let name = create_u16_data(MAX_COLLECTION_NAME_LENGTH)27 .try_into()28 .unwrap();29 let description = create_u16_data(MAX_COLLECTION_DESCRIPTION_LENGTH)30 .try_into()31 .unwrap();32 let token_prefix = create_data(MAX_TOKEN_PREFIX_LENGTH).try_into().unwrap();33 let offchain_schema = create_data(OFFCHAIN_SCHEMA_LIMIT as usize)34 .try_into()35 .unwrap();36 let variable_on_chain_schema = create_data(VARIABLE_ON_CHAIN_SCHEMA_LIMIT as usize)37 .try_into()38 .unwrap();39 let const_on_chain_schema = create_data(CONST_ON_CHAIN_SCHEMA_LIMIT as usize)40 .try_into()41 .unwrap();42 handler(Collection {43 owner,44 mode,45 access: Default::default(),46 name,47 description,48 token_prefix,49 mint_mode: true,50 offchain_schema,51 schema_version: Default::default(),52 sponsorship: Default::default(),53 limits: Default::default(),54 variable_on_chain_schema,55 const_on_chain_schema,56 meta_update_permission: Default::default(),57 })58 .and_then(CollectionHandle::try_get)59 .map(cast)60}6162#[macro_export]63macro_rules! bench_init {64 ($name:ident: sub $(($id:expr))?; $($rest:tt)*) => {65 let $name: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);66 bench_init!($($rest)*);67 };68 ($name:ident: collection($owner:ident); $($rest:tt)*) => {69 let $name = create_collection::<T>($owner.clone())?;70 bench_init!($($rest)*);71 };72 ($name:ident: cross; $($rest:tt)*) => {73 let $name = T::CrossAccountId::from_sub($name);74 bench_init!($($rest)*);75 };76 ($name:ident: cross_sub $(($id:expr))?; $($rest:tt)*) => {77 let account: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);78 let $name = T::CrossAccountId::from_sub(account);79 bench_init!($($rest)*);80 };81 ($name:ident: cross_from_sub; $($rest:tt)*) => {82 let $name = T::CrossAccountId::from_sub($name);83 bench_init!($($rest)*);84 };85 ($name:ident: cross_from_sub($from:ident); $($rest:tt)*) => {86 let $name = T::CrossAccountId::from_sub($from);87 bench_init!($($rest)*);88 };89 () => {}90}1use sp_std::vec::Vec;2use crate::{Config, CollectionHandle};3use up_data_structs::{4 CollectionMode, CreateCollectionData, CollectionId, MAX_COLLECTION_NAME_LENGTH,5 MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, OFFCHAIN_SCHEMA_LIMIT,6 VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT,7};8use frame_support::{9 traits::{Currency, Get},10 pallet_prelude::ConstU32,11 BoundedVec,12};13use core::convert::TryInto;14use sp_runtime::DispatchError;1516pub fn create_data<const S: u32>() -> BoundedVec<u8, ConstU32<S>> {17 create_var_data::<S>(S)18}19pub fn create_u16_data<const S: u32>() -> BoundedVec<u16, ConstU32<S>> {20 (0..S)21 .map(|v| (v & 0xffff) as u16)22 .collect::<Vec<_>>()23 .try_into()24 .unwrap()25}26pub fn create_var_data<const S: u32>(size: u32) -> BoundedVec<u8, ConstU32<S>> {27 assert!(28 size <= S,29 "size ({}) should be less within bound ({})",30 size,31 S32 );33 (0..size)34 .map(|v| (v & 0xff) as u8)35 .collect::<Vec<_>>()36 .try_into()37 .unwrap()38}3940pub fn create_collection_raw<T: Config, R>(41 owner: T::AccountId,42 mode: CollectionMode,43 handler: impl FnOnce(44 T::AccountId,45 CreateCollectionData<T::AccountId>,46 ) -> Result<CollectionId, DispatchError>,47 cast: impl FnOnce(CollectionHandle<T>) -> R,48) -> Result<R, DispatchError> {49 T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());50 let name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();51 let description = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();52 let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();53 let offchain_schema = create_data::<OFFCHAIN_SCHEMA_LIMIT>();54 let variable_on_chain_schema = create_data::<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>();55 let const_on_chain_schema = create_data::<CONST_ON_CHAIN_SCHEMA_LIMIT>();56 handler(57 owner,58 CreateCollectionData {59 mode,60 name,61 description,62 token_prefix,63 offchain_schema,64 variable_on_chain_schema,65 const_on_chain_schema,66 ..Default::default()67 },68 )69 .and_then(CollectionHandle::try_get)70 .map(cast)71}7273/// Helper macros, which handles all benchmarking preparation in semi-declarative way74///75/// `name` is a substrate account76/// - name: sub[(id)]77/// `name` is a collection with owner `owner`78/// - name: collection(owner)79/// `name` is a cross account based on substrate80/// - name: cross_sub[(id)]81/// `name` is a cross account, which maps to substrate account `name`82/// - name: cross_from_sub83/// `name` is a cross account, which maps to substrate account `other_name`84/// - name: cross_from_sub(other_name)85#[macro_export]86macro_rules! bench_init {87 ($name:ident: sub $(($id:expr))?; $($rest:tt)*) => {88 let $name: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);89 bench_init!($($rest)*);90 };91 ($name:ident: collection($owner:ident); $($rest:tt)*) => {92 let $name = create_collection::<T>($owner.clone())?;93 bench_init!($($rest)*);94 };95 ($name:ident: cross; $($rest:tt)*) => {96 let $name = T::CrossAccountId::from_sub($name);97 bench_init!($($rest)*);98 };99 ($name:ident: cross_sub $(($id:expr))?; $($rest:tt)*) => {100 let account: T::AccountId = account(stringify!($name), 0 $(+ $id)?, SEED);101 let $name = T::CrossAccountId::from_sub(account);102 bench_init!($($rest)*);103 };104 ($name:ident: cross_from_sub; $($rest:tt)*) => {105 let $name = T::CrossAccountId::from_sub($name);106 bench_init!($($rest)*);107 };108 ($name:ident: cross_from_sub($from:ident); $($rest:tt)*) => {109 let $name = T::CrossAccountId::from_sub($from);110 bench_init!($($rest)*);111 };112 () => {}113}pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -12,7 +12,7 @@
};
pub struct CommonWeights<T: Config>(PhantomData<T>);
-impl<T: Config> CommonWeightInfo for CommonWeights<T> {
+impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_item() -> Weight {
<SelfWeightOf<T>>::create_item()
}
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -9,7 +9,7 @@
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
-use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
+use sp_std::collections::btree_map::BTreeMap;
pub use pallet::*;
@@ -222,7 +222,7 @@
pub fn create_multiple_items(
collection: &FungibleHandle<T>,
sender: &T::CrossAccountId,
- data: Vec<CreateItemData<T>>,
+ data: BTreeMap<T::CrossAccountId, u128>,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
ensure!(
@@ -236,22 +236,18 @@
}
}
- let mut balances = BTreeMap::new();
-
let total_supply = data
.iter()
- .map(|u| u.1)
+ .map(|(_, v)| *v)
.try_fold(<TotalSupply<T>>::get(collection.id), |acc, v| {
acc.checked_add(v)
})
.ok_or(ArithmeticError::Overflow)?;
- for (user, amount) in data.into_iter() {
- let balance = balances
- .entry(user.clone())
- .or_insert_with(|| <Balance<T>>::get((collection.id, user)));
- *balance = (*balance)
- .checked_add(amount)
+ let mut balances = data;
+ for (k, v) in balances.iter_mut() {
+ *v = <Balance<T>>::get((collection.id, &k))
+ .checked_add(*v)
.ok_or(ArithmeticError::Overflow)?;
}
pallets/inflation/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/inflation/src/benchmarking.rs
+++ b/pallets/inflation/src/benchmarking.rs
@@ -1,7 +1,7 @@
#![cfg(feature = "runtime-benchmarks")]
use super::*;
-use crate::Module as Inflation;
+use crate::Pallet as Inflation;
use frame_benchmarking::{benchmarks};
use frame_support::traits::OnInitialize;
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -2,18 +2,18 @@
use crate::{Pallet, Config, NonfungibleHandle};
use sp_std::prelude::*;
-use pallet_common::benchmarking::{create_collection_raw, create_data};
+use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data};
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT};
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 {
+ let const_data = create_data::<CUSTOM_DATA_LIMIT>();
+ let variable_data = create_data::<CUSTOM_DATA_LIMIT>();
+ CreateItemData::<T> {
const_data,
variable_data,
owner,
@@ -24,7 +24,7 @@
sender: &T::CrossAccountId,
owner: T::CrossAccountId,
) -> Result<TokenId, DispatchError> {
- <Pallet<T>>::create_item(&collection, sender, create_max_item_data(owner))?;
+ <Pallet<T>>::create_item(&collection, sender, create_max_item_data::<T>(owner))?;
Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))
}
@@ -53,7 +53,9 @@
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();
+ let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();
+ }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
+
}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data)?}
burn_item {
@@ -105,6 +107,6 @@
owner: cross_from_sub; sender: cross_sub;
};
let item = create_max_item(&collection, &owner, sender.clone())?;
- let data = create_data(b as usize);
+ let data = create_var_data(b).try_into().unwrap();
}: {<Pallet<T>>::set_variable_metadata(&collection, &sender, item, data)?}
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -12,7 +12,7 @@
};
pub struct CommonWeights<T: Config>(PhantomData<T>);
-impl<T: Config> CommonWeightInfo for CommonWeights<T> {
+impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_item() -> Weight {
<SelfWeightOf<T>>::create_item()
}
@@ -51,7 +51,7 @@
to: &T::CrossAccountId,
) -> Result<CreateItemData<T>, DispatchError> {
match data {
- up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData {
+ up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {
const_data: data.const_data,
variable_data: data.variable_data,
owner: to.clone(),
@@ -68,7 +68,7 @@
data: up_data_structs::CreateItemData,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::create_item(self, &sender, map_create_data(data, &to)?),
+ <Pallet<T>>::create_item(self, &sender, map_create_data::<T>(data, &to)?),
<CommonWeights<T>>::create_item(),
)
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -232,7 +232,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData {
+ CreateItemData::<T> {
const_data: BoundedVec::default(),
variable_data: BoundedVec::default(),
owner: to,
@@ -268,7 +268,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData {
+ CreateItemData::<T> {
const_data: Vec::<u8>::from(token_uri)
.try_into()
.map_err(|_| "token uri is too long")?,
@@ -376,7 +376,7 @@
expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;
}
let data = (0..total_tokens)
- .map(|_| CreateItemData {
+ .map(|_| CreateItemData::<T> {
const_data: BoundedVec::default(),
variable_data: BoundedVec::default(),
owner: to.clone(),
@@ -409,7 +409,7 @@
}
expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;
- data.push(CreateItemData {
+ data.push(CreateItemData::<T> {
const_data: Vec::<u8>::from(token_uri)
.try_into()
.map_err(|_| "token uri is too long")?,
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -2,24 +2,28 @@
use crate::{Pallet, Config, RefungibleHandle};
use sp_std::prelude::*;
-use pallet_common::benchmarking::{create_collection_raw, create_data};
+use pallet_common::benchmarking::{create_collection_raw, create_data, create_var_data};
use frame_benchmarking::{benchmarks, account};
-use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH};
+use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, CUSTOM_DATA_LIMIT};
use pallet_common::bench_init;
use core::convert::TryInto;
use core::iter::IntoIterator;
const SEED: u32 = 1;
-fn create_max_item_data<T: Config>(
- users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,
-) -> 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 {
+fn create_max_item_data<CrossAccountId: Ord>(
+ users: impl IntoIterator<Item = (CrossAccountId, u128)>,
+) -> CreateRefungibleExData<CrossAccountId> {
+ let const_data = create_data::<CUSTOM_DATA_LIMIT>();
+ let variable_data = create_data::<CUSTOM_DATA_LIMIT>();
+ CreateRefungibleExData {
const_data,
variable_data,
- users: users.into_iter().collect(),
+ users: users
+ .into_iter()
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .unwrap(),
}
}
fn create_max_item<T: Config>(
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -8,8 +8,8 @@
use sp_std::vec::Vec;
use crate::{
- AccountBalance, Allowance, Balance, Config, CreateItemData, Error, Owned, Pallet,
- RefungibleHandle, SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,
+ AccountBalance, Allowance, Balance, Config, Error, Owned, Pallet, RefungibleHandle,
+ SelfWeightOf, TokenData, weights::WeightInfo, TokensMinted,
};
macro_rules! max_weight_of {
@@ -22,7 +22,7 @@
}
pub struct CommonWeights<T: Config>(PhantomData<T>);
-impl<T: Config> CommonWeightInfo for CommonWeights<T> {
+impl<T: Config> CommonWeightInfo<T::CrossAccountId> for CommonWeights<T> {
fn create_item() -> Weight {
<SelfWeightOf<T>>::create_item()
}
pallets/unique/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -5,9 +5,8 @@
use frame_system::RawOrigin;
use frame_benchmarking::{benchmarks, account};
use up_data_structs::*;
-use core::convert::TryInto;
use sp_runtime::DispatchError;
-use pallet_common::benchmarking::{create_data, create_u16_data};
+use pallet_common::benchmarking::{create_data, create_var_data, create_u16_data};
const SEED: u32 = 1;
@@ -16,13 +15,9 @@
mode: CollectionMode,
) -> Result<CollectionId, DispatchError> {
T::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
- let col_name = create_u16_data(MAX_COLLECTION_NAME_LENGTH)
- .try_into()
- .unwrap();
- let col_desc = create_u16_data(MAX_COLLECTION_DESCRIPTION_LENGTH)
- .try_into()
- .unwrap();
- let token_prefix = create_data(MAX_TOKEN_PREFIX_LENGTH).try_into().unwrap();
+ let col_name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
+ let col_desc = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();
+ let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
<Pallet<T>>::create_collection(
RawOrigin::Signed(owner).into(),
col_name,
@@ -37,11 +32,10 @@
}
benchmarks! {
-
create_collection {
- let col_name: Vec<u16> = create_u16_data(MAX_COLLECTION_NAME_LENGTH);
- let col_desc: Vec<u16> = create_u16_data(MAX_COLLECTION_DESCRIPTION_LENGTH);
- let token_prefix: Vec<u8> = create_data(MAX_TOKEN_PREFIX_LENGTH);
+ let col_name = create_u16_data::<MAX_COLLECTION_NAME_LENGTH>();
+ let col_desc = create_u16_data::<MAX_COLLECTION_DESCRIPTION_LENGTH>();
+ let token_prefix = create_data::<MAX_TOKEN_PREFIX_LENGTH>();
let mode: CollectionMode = CollectionMode::NFT;
let caller: T::AccountId = account("caller", 0, SEED);
T::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
@@ -125,7 +119,7 @@
let caller: T::AccountId = account("caller", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
- let data = create_data(b as usize);
+ let data = create_var_data(b);
}: set_offchain_schema(RawOrigin::Signed(caller.clone()), collection, data)
set_const_on_chain_schema {
@@ -133,7 +127,7 @@
let caller: T::AccountId = account("caller", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
- let data = create_data(b as usize);
+ let data = create_var_data(b);
}: set_const_on_chain_schema(RawOrigin::Signed(caller.clone()), collection, data)
set_variable_on_chain_schema {
@@ -141,7 +135,7 @@
let caller: T::AccountId = account("caller", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
- let data = create_data(b as usize);
+ let data = create_var_data(b);
}: set_variable_on_chain_schema(RawOrigin::Signed(caller.clone()), collection, data)
set_schema_version {
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -76,9 +76,7 @@
/// create_many call
pub const MAX_ITEMS_PER_BATCH: u32 = 200;
-parameter_types! {
- pub const CustomDataLimit: u32 = CUSTOM_DATA_LIMIT;
-}
+pub type CustomDataLimit = ConstU32<CUSTOM_DATA_LIMIT>;
#[derive(
Encode,
@@ -417,15 +415,72 @@
}
}
+fn bounded_debug<V, S>(v: &BoundedVec<V, S>, f: &mut fmt::Formatter) -> Result<(), fmt::Error>
+where
+ V: fmt::Debug,
+{
+ use core::fmt::Debug;
+ (&v as &Vec<V>).fmt(f)
+}
+
+#[cfg(feature = "serde1")]
+#[allow(dead_code)]
+mod bounded_map_serde {
+ use core::convert::TryFrom;
+ use sp_std::collections::btree_map::BTreeMap;
+ use frame_support::{traits::Get, storage::bounded_btree_map::BoundedBTreeMap};
+ use serde::{
+ ser::{self, Serialize},
+ de::{self, Deserialize, Error},
+ };
+ pub fn serialize<D, K, V, S>(
+ value: &BoundedBTreeMap<K, V, S>,
+ serializer: D,
+ ) -> Result<D::Ok, D::Error>
+ where
+ D: ser::Serializer,
+ K: Serialize + Ord,
+ V: Serialize,
+ {
+ (value as &BTreeMap<_, _>).serialize(serializer)
+ }
+
+ pub fn deserialize<'de, D, K, V, S>(
+ deserializer: D,
+ ) -> Result<BoundedBTreeMap<K, V, S>, D::Error>
+ where
+ D: de::Deserializer<'de>,
+ K: de::Deserialize<'de> + Ord,
+ V: de::Deserialize<'de>,
+ S: Get<u32>,
+ {
+ let map = <BTreeMap<K, V>>::deserialize(deserializer)?;
+ let len = map.len();
+ TryFrom::try_from(map).map_err(|_| D::Error::invalid_length(len, &"lesser size"))
+ }
+}
+
+fn bounded_map_debug<K, V, S>(
+ v: &BoundedBTreeMap<K, V, S>,
+ f: &mut fmt::Formatter,
+) -> Result<(), fmt::Error>
+where
+ K: fmt::Debug + Ord,
+ V: fmt::Debug,
+{
+ use core::fmt::Debug;
+ (&v as &BTreeMap<K, V>).fmt(f)
+}
+
#[derive(Encode, Decode, MaxEncodedLen, Default, PartialEq, Clone, Derivative, TypeInfo)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
#[derivative(Debug)]
pub struct CreateNftData {
#[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
- #[derivative(Debug = "ignore")]
+ #[derivative(Debug(format_with = "bounded_debug"))]
pub const_data: BoundedVec<u8, CustomDataLimit>,
#[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
- #[derivative(Debug = "ignore")]
+ #[derivative(Debug(format_with = "bounded_debug"))]
pub variable_data: BoundedVec<u8, CustomDataLimit>,
}
@@ -440,10 +495,10 @@
#[derivative(Debug)]
pub struct CreateReFungibleData {
#[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
- #[derivative(Debug = "ignore")]
+ #[derivative(Debug(format_with = "bounded_debug"))]
pub const_data: BoundedVec<u8, CustomDataLimit>,
#[cfg_attr(feature = "serde1", serde(with = "bounded_serde"))]
- #[derivative(Debug = "ignore")]
+ #[derivative(Debug(format_with = "bounded_debug"))]
pub variable_data: BoundedVec<u8, CustomDataLimit>,
pub pieces: u128,
}