difftreelog
fix benchmarks rft, fix some warnings
in: master
2 files changed
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth228 owner: sub; collection: collection(owner); owner: cross_from_sub;228 owner: sub; collection: collection(owner); owner: cross_from_sub;229 operator: cross_sub;229 operator: cross_sub;230 };230 };231 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)}231 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}232232233 allowance_for_all {233 allowance_for_all {234 bench_init!{234 bench_init!{pallets/refungible/src/benchmarking.rsdiffbeforeafterboth22use frame_benchmarking::{benchmarks, account};22use frame_benchmarking::{benchmarks, account};23use pallet_common::{23use pallet_common::{24 bench_init,24 bench_init,25 benchmarking::{create_collection_raw, property_key, property_value, create_data},25 benchmarking::{create_collection_raw, property_key, property_value},26};26};27use sp_core::H160;28use sp_std::prelude::*;27use sp_std::prelude::*;29use up_data_structs::{28use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};30 CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT,31 budget::Unlimited,32};332934const SEED: u32 = 1;30const SEED: u32 = 1;353136fn create_max_item_data<CrossAccountId: Ord>(32fn create_max_item_data<T: Config>(37 users: impl IntoIterator<Item = (CrossAccountId, u128)>,33 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,38) -> CreateItemData<CrossAccountId> {34) -> CreateItemData<T> {39 CreateItemData {35 CreateItemData::<T> {40 users: users36 users: users41 .into_iter()37 .into_iter()42 .collect::<BTreeMap<_, _>>()38 .collect::<BTreeMap<_, _>>()51 sender: &T::CrossAccountId,47 sender: &T::CrossAccountId,52 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,48 users: impl IntoIterator<Item = (T::CrossAccountId, u128)>,53) -> Result<TokenId, DispatchError> {49) -> Result<TokenId, DispatchError> {54 let data: CreateItemData<T::CrossAccountId> = create_max_item_data(users);50 let data: CreateItemData<T> = create_max_item_data::<T>(users);55 <Pallet<T>>::create_item(&collection, sender, data, &Unlimited)?;51 <Pallet<T>>::create_item(&collection, sender, data, &Unlimited)?;56 Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))52 Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))57}53}83 owner: sub; collection: collection(owner);79 owner: sub; collection: collection(owner);84 sender: cross_from_sub(owner); to: cross_sub;80 sender: cross_from_sub(owner); to: cross_sub;85 };81 };86 let data = (0..b).map(|_| create_max_item_data([(to.clone(), 200)])).collect();82 let data = (0..b).map(|_| create_max_item_data::<T>([(to.clone(), 200)])).collect();87 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}83 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}888489 create_multiple_items_ex_multiple_items {85 create_multiple_items_ex_multiple_items {94 };90 };95 let data = (0..b).map(|t| {91 let data = (0..b).map(|t| {96 bench_init!(to: cross_sub(t););92 bench_init!(to: cross_sub(t););97 create_max_item_data([(to, 200)])93 create_max_item_data::<T>([(to, 200)])98 }).collect();94 }).collect();99 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}95 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}10096104 owner: sub; collection: collection(owner);100 owner: sub; collection: collection(owner);105 sender: cross_from_sub(owner);101 sender: cross_from_sub(owner);106 };102 };107 let data = vec![create_max_item_data((0..b).map(|u| {103 let data = vec![create_max_item_data::<T>((0..b).map(|u| {108 bench_init!(to: cross_sub(u););104 bench_init!(to: cross_sub(u););109 (to, 200)105 (to, 200)110 }))].try_into().unwrap();106 }))].try_into().unwrap();296 owner: sub; collection: collection(owner); owner: cross_from_sub;292 owner: sub; collection: collection(owner); owner: cross_from_sub;297 operator: cross_sub;293 operator: cross_sub;298 };294 };299 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)}295 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}300296301 allowance_for_all {297 allowance_for_all {302 bench_init!{298 bench_init!{