difftreelog
fix benchmarks
in: master
5 files changed
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -31,7 +31,9 @@
create_collection_raw(
owner,
CollectionMode::Fungible(0),
- |owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+ |owner: T::CrossAccountId, data| {
+ <Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())
+ },
FungibleHandle::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 super::*;18use crate::{Pallet, Config, RefungibleHandle};1920use core::convert::TryInto;21use core::iter::IntoIterator;22use frame_benchmarking::{benchmarks, account};23use pallet_common::{24 bench_init,25 benchmarking::{create_collection_raw, property_key, property_value, create_data},26};27use sp_core::H160;28use sp_std::prelude::*;29use up_data_structs::{30 CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT,31 budget::Unlimited,32};3334const SEED: u32 = 1;3536fn create_max_item_data<CrossAccountId: Ord>(37 users: impl IntoIterator<Item = (CrossAccountId, u128)>,38) -> CreateItemData<CrossAccountId> {39 CreateItemData {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::CrossAccountId> = create_max_item_data(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| <Pallet<T>>::init_collection(owner.clone(), owner, data),66 RefungibleHandle::cast,67 )68}6970benchmarks! {71 create_item {72 bench_init!{73 owner: sub; collection: collection(owner);74 sender: cross_from_sub(owner); to: cross_sub;75 };76 }: {create_max_item(&collection, &sender, [(to.clone(), 200)])?}7778 create_multiple_items {79 let b in 0..MAX_ITEMS_PER_BATCH;80 bench_init!{81 owner: sub; collection: collection(owner);82 sender: cross_from_sub(owner); to: cross_sub;83 };84 let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect();85 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8687 create_multiple_items_ex_multiple_items {88 let b in 0..MAX_ITEMS_PER_BATCH;89 bench_init!{90 owner: sub; collection: collection(owner);91 sender: cross_from_sub(owner);92 };93 let data = (0..b).map(|t| {94 bench_init!(to: cross_sub(t););95 create_max_item_data([(to, 200)])96 }).collect();97 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9899 create_multiple_items_ex_multiple_owners {100 let b in 0..MAX_ITEMS_PER_BATCH;101 bench_init!{102 owner: sub; collection: collection(owner);103 sender: cross_from_sub(owner);104 };105 let data = vec![create_max_item_data((0..b).map(|u| {106 bench_init!(to: cross_sub(u););107 (to, 200)108 }))].try_into().unwrap();109 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}110111 // Other user left, token data is kept112 burn_item_partial {113 bench_init!{114 owner: sub; collection: collection(owner);115 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;116 };117 let item = create_max_item(&collection, &sender, [(burner.clone(), 200), (another_owner, 200)])?;118 }: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}119 // No users remaining, token is destroyed120 burn_item_fully {121 bench_init!{122 owner: sub; collection: collection(owner);123 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;124 };125 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;126 }: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}127128 transfer_normal {129 bench_init!{130 owner: sub; collection: collection(owner);131 sender: cross_from_sub(owner); receiver: cross_sub;132 };133 let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;134 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}135 // Target account is created136 transfer_creating {137 bench_init!{138 owner: sub; collection: collection(owner);139 sender: cross_from_sub(owner); receiver: cross_sub;140 };141 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;142 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}143 // Source account is destroyed144 transfer_removing {145 bench_init!{146 owner: sub; collection: collection(owner);147 sender: cross_from_sub(owner); receiver: cross_sub;148 };149 let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;150 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}151 // Source account destroyed, target created152 transfer_creating_removing {153 bench_init!{154 owner: sub; collection: collection(owner);155 sender: cross_from_sub(owner); receiver: cross_sub;156 };157 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;158 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}159160 approve {161 bench_init!{162 owner: sub; collection: collection(owner);163 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;164 };165 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;166 }: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?}167168 transfer_from_normal {169 bench_init!{170 owner: sub; collection: collection(owner);171 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;172 };173 let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;174 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;175 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}176 // Target account is created177 transfer_from_creating {178 bench_init!{179 owner: sub; collection: collection(owner);180 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;181 };182 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;183 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;184 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}185 // Source account is destroyed186 transfer_from_removing {187 bench_init!{188 owner: sub; collection: collection(owner);189 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;190 };191 let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;192 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;193 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}194 // Source account destroyed, target created195 transfer_from_creating_removing {196 bench_init!{197 owner: sub; collection: collection(owner);198 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;199 };200 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;201 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;202 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}203204 // Both source account and token is destroyed205 burn_from {206 bench_init!{207 owner: sub; collection: collection(owner);208 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;209 };210 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;211 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;212 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}213214 set_token_property_permissions {215 let b in 0..MAX_PROPERTIES_PER_ITEM;216 bench_init!{217 owner: sub; collection: collection(owner);218 owner: cross_from_sub;219 };220 let perms = (0..b).map(|k| PropertyKeyPermission {221 key: property_key(k as usize),222 permission: PropertyPermission {223 mutable: false,224 collection_admin: false,225 token_owner: false,226 },227 }).collect::<Vec<_>>();228 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}229230 set_token_properties {231 let b in 0..MAX_PROPERTIES_PER_ITEM;232 bench_init!{233 owner: sub; collection: collection(owner);234 owner: cross_from_sub;235 };236 let perms = (0..b).map(|k| PropertyKeyPermission {237 key: property_key(k as usize),238 permission: PropertyPermission {239 mutable: false,240 collection_admin: true,241 token_owner: true,242 },243 }).collect::<Vec<_>>();244 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;245 let props = (0..b).map(|k| Property {246 key: property_key(k as usize),247 value: property_value(),248 }).collect::<Vec<_>>();249 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;250 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}251252 delete_token_properties {253 let b in 0..MAX_PROPERTIES_PER_ITEM;254 bench_init!{255 owner: sub; collection: collection(owner);256 owner: cross_from_sub;257 };258 let perms = (0..b).map(|k| PropertyKeyPermission {259 key: property_key(k as usize),260 permission: PropertyPermission {261 mutable: true,262 collection_admin: true,263 token_owner: true,264 },265 }).collect::<Vec<_>>();266 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;267 let props = (0..b).map(|k| Property {268 key: property_key(k as usize),269 value: property_value(),270 }).collect::<Vec<_>>();271 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;272 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;273 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();274 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}275276 repartition_item {277 bench_init!{278 owner: sub; collection: collection(owner);279 sender: cross_from_sub(owner); owner: cross_sub;280 };281 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;282 }: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}283284 token_owner {285 bench_init!{286 owner: sub; collection: collection(owner);287 sender: cross_from_sub(owner); owner: cross_sub;288 };289 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;290 }: {<Pallet<T>>::token_owner(collection.id, item)}291}1// 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, RefungibleHandle};1920use core::convert::TryInto;21use core::iter::IntoIterator;22use frame_benchmarking::{benchmarks, account};23use pallet_common::{24 bench_init,25 benchmarking::{create_collection_raw, property_key, property_value, create_data},26};27use sp_core::H160;28use sp_std::prelude::*;29use up_data_structs::{30 CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT,31 budget::Unlimited,32};3334const SEED: u32 = 1;3536fn create_max_item_data<CrossAccountId: Ord>(37 users: impl IntoIterator<Item = (CrossAccountId, u128)>,38) -> CreateItemData<CrossAccountId> {39 CreateItemData {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::CrossAccountId> = create_max_item_data(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 <Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())67 },68 RefungibleHandle::cast,69 )70}7172benchmarks! {73 create_item {74 bench_init!{75 owner: sub; collection: collection(owner);76 sender: cross_from_sub(owner); to: cross_sub;77 };78 }: {create_max_item(&collection, &sender, [(to.clone(), 200)])?}7980 create_multiple_items {81 let b in 0..MAX_ITEMS_PER_BATCH;82 bench_init!{83 owner: sub; collection: collection(owner);84 sender: cross_from_sub(owner); to: cross_sub;85 };86 let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect();87 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8889 create_multiple_items_ex_multiple_items {90 let b in 0..MAX_ITEMS_PER_BATCH;91 bench_init!{92 owner: sub; collection: collection(owner);93 sender: cross_from_sub(owner);94 };95 let data = (0..b).map(|t| {96 bench_init!(to: cross_sub(t););97 create_max_item_data([(to, 200)])98 }).collect();99 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}100101 create_multiple_items_ex_multiple_owners {102 let b in 0..MAX_ITEMS_PER_BATCH;103 bench_init!{104 owner: sub; collection: collection(owner);105 sender: cross_from_sub(owner);106 };107 let data = vec![create_max_item_data((0..b).map(|u| {108 bench_init!(to: cross_sub(u););109 (to, 200)110 }))].try_into().unwrap();111 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}112113 // Other user left, token data is kept114 burn_item_partial {115 bench_init!{116 owner: sub; collection: collection(owner);117 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;118 };119 let item = create_max_item(&collection, &sender, [(burner.clone(), 200), (another_owner, 200)])?;120 }: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}121 // No users remaining, token is destroyed122 burn_item_fully {123 bench_init!{124 owner: sub; collection: collection(owner);125 sender: cross_from_sub(owner); burner: cross_sub; another_owner: cross_sub;126 };127 let item = create_max_item(&collection, &sender, [(burner.clone(), 200)])?;128 }: {<Pallet<T>>::burn(&collection, &burner, item, 200)?}129130 transfer_normal {131 bench_init!{132 owner: sub; collection: collection(owner);133 sender: cross_from_sub(owner); receiver: cross_sub;134 };135 let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;136 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}137 // Target account is created138 transfer_creating {139 bench_init!{140 owner: sub; collection: collection(owner);141 sender: cross_from_sub(owner); receiver: cross_sub;142 };143 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;144 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 100, &Unlimited)?}145 // Source account is destroyed146 transfer_removing {147 bench_init!{148 owner: sub; collection: collection(owner);149 sender: cross_from_sub(owner); receiver: cross_sub;150 };151 let item = create_max_item(&collection, &sender, [(sender.clone(), 200), (receiver.clone(), 200)])?;152 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}153 // Source account destroyed, target created154 transfer_creating_removing {155 bench_init!{156 owner: sub; collection: collection(owner);157 sender: cross_from_sub(owner); receiver: cross_sub;158 };159 let item = create_max_item(&collection, &sender, [(sender.clone(), 200)])?;160 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, 200, &Unlimited)?}161162 approve {163 bench_init!{164 owner: sub; collection: collection(owner);165 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;166 };167 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;168 }: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?}169170 transfer_from_normal {171 bench_init!{172 owner: sub; collection: collection(owner);173 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;174 };175 let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;176 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;177 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}178 // Target account is created179 transfer_from_creating {180 bench_init!{181 owner: sub; collection: collection(owner);182 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;183 };184 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;185 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 100)?;186 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 100, &Unlimited)?}187 // Source account is destroyed188 transfer_from_removing {189 bench_init!{190 owner: sub; collection: collection(owner);191 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;192 };193 let item = create_max_item(&collection, &owner, [(sender.clone(), 200), (receiver.clone(), 200)])?;194 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;195 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}196 // Source account destroyed, target created197 transfer_from_creating_removing {198 bench_init!{199 owner: sub; collection: collection(owner);200 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;201 };202 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;203 <Pallet<T>>::set_allowance(&collection, &sender, &spender, item, 200)?;204 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, 200, &Unlimited)?}205206 // Both source account and token is destroyed207 burn_from {208 bench_init!{209 owner: sub; collection: collection(owner);210 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;211 };212 let item = create_max_item(&collection, &owner, [(sender.clone(), 200)])?;213 <Pallet<T>>::set_allowance(&collection, &sender, &burner, item, 200)?;214 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, 200, &Unlimited)?}215216 set_token_property_permissions {217 let b in 0..MAX_PROPERTIES_PER_ITEM;218 bench_init!{219 owner: sub; collection: collection(owner);220 owner: cross_from_sub;221 };222 let perms = (0..b).map(|k| PropertyKeyPermission {223 key: property_key(k as usize),224 permission: PropertyPermission {225 mutable: false,226 collection_admin: false,227 token_owner: false,228 },229 }).collect::<Vec<_>>();230 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}231232 set_token_properties {233 let b in 0..MAX_PROPERTIES_PER_ITEM;234 bench_init!{235 owner: sub; collection: collection(owner);236 owner: cross_from_sub;237 };238 let perms = (0..b).map(|k| PropertyKeyPermission {239 key: property_key(k as usize),240 permission: PropertyPermission {241 mutable: false,242 collection_admin: true,243 token_owner: true,244 },245 }).collect::<Vec<_>>();246 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;247 let props = (0..b).map(|k| Property {248 key: property_key(k as usize),249 value: property_value(),250 }).collect::<Vec<_>>();251 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;252 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}253254 delete_token_properties {255 let b in 0..MAX_PROPERTIES_PER_ITEM;256 bench_init!{257 owner: sub; collection: collection(owner);258 owner: cross_from_sub;259 };260 let perms = (0..b).map(|k| PropertyKeyPermission {261 key: property_key(k as usize),262 permission: PropertyPermission {263 mutable: true,264 collection_admin: true,265 token_owner: true,266 },267 }).collect::<Vec<_>>();268 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;269 let props = (0..b).map(|k| Property {270 key: property_key(k as usize),271 value: property_value(),272 }).collect::<Vec<_>>();273 let item = create_max_item(&collection, &owner, [(owner.clone(), 200)])?;274 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;275 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();276 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}277278 repartition_item {279 bench_init!{280 owner: sub; collection: collection(owner);281 sender: cross_from_sub(owner); owner: cross_sub;282 };283 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;284 }: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}285286 token_owner {287 bench_init!{288 owner: sub; collection: collection(owner);289 sender: cross_from_sub(owner); owner: cross_sub;290 };291 let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;292 }: {<Pallet<T>>::token_owner(collection.id, item)}293}pallets/scheduler/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -93,9 +93,9 @@
Ok(())
}
-fn call_and_hash<T: Config>(i: u32) -> (<T as Config>::Call, T::Hash) {
+fn call_and_hash<T: Config>(i: u32) -> (<T as Config>::RuntimeCall, T::Hash) {
// Essentially a no-op call.
- let call: <T as Config>::Call = frame_system::Call::remark { remark: i.encode() }.into();
+ let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: i.encode() }.into();
let hash = T::Hashing::hash_of(&call);
(call, hash)
}
pallets/structure/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -19,7 +19,8 @@
use frame_benchmarking::{benchmarks, account};
use frame_support::traits::{Currency, Get};
use up_data_structs::{
- CreateCollectionData, CollectionMode, CreateItemData, CreateNftData, budget::Unlimited,
+ CreateCollectionData, CollectionMode, CreateItemData, CollectionFlags, CreateNftData,
+ budget::Unlimited,
};
use pallet_common::Config as CommonConfig;
use pallet_evm::account::CrossAccountId;
@@ -32,10 +33,15 @@
let caller_cross = T::CrossAccountId::from_sub(caller.clone());
<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
- T::CollectionDispatch::create(caller_cross.clone(), caller_cross.clone(), CreateCollectionData {
- mode: CollectionMode::NFT,
- ..Default::default()
- })?;
+ T::CollectionDispatch::create(
+ caller_cross.clone(),
+ caller_cross.clone(),
+ CreateCollectionData {
+ mode: CollectionMode::NFT,
+ ..Default::default()
+ },
+ CollectionFlags::default(),
+ )?;
let dispatch = T::CollectionDispatch::dispatch(CollectionHandle::try_get(CollectionId(1))?);
let dispatch = dispatch.as_dyn();
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -683,8 +683,8 @@
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
list_benchmark!(list, extra, pallet_refungible, Refungible);
- #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
- list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
+ // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+ // list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);
@@ -743,8 +743,8 @@
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
add_benchmark!(params, batches, pallet_refungible, Refungible);
- #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
- add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
+ // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+ // add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);