difftreelog
Merge pull request #676 from UniqueNetwork/fix/benchmakrs-n-try-runtime
in: master
Fix/benchmakrs n try runtime
6 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.8",
"once_cell",
"version_check",
]
@@ -108,9 +108,9 @@
[[package]]
name = "anyhow"
-version = "1.0.65"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "app-promotion-rpc"
@@ -392,7 +392,7 @@
checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
dependencies = [
"futures-core",
- "getrandom 0.2.7",
+ "getrandom 0.2.8",
"instant",
"pin-project-lite 0.2.9",
"rand 0.8.5",
@@ -434,9 +434,9 @@
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64ct"
@@ -2442,7 +2442,7 @@
[[package]]
name = "fc-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"async-trait",
"fc-db",
@@ -2461,7 +2461,7 @@
[[package]]
name = "fc-db"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"fp-storage",
"kvdb-rocksdb",
@@ -2477,7 +2477,7 @@
[[package]]
name = "fc-mapping-sync"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"fc-db",
"fp-consensus",
@@ -2494,7 +2494,7 @@
[[package]]
name = "fc-rpc"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2536,7 +2536,7 @@
[[package]]
name = "fc-rpc-core"
version = "1.1.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2676,7 +2676,7 @@
[[package]]
name = "fp-consensus"
version = "2.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"parity-scale-codec 3.2.1",
@@ -2688,7 +2688,7 @@
[[package]]
name = "fp-evm"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"evm",
"frame-support",
@@ -2702,7 +2702,7 @@
[[package]]
name = "fp-evm-mapping"
version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"frame-support",
"sp-core",
@@ -2711,7 +2711,7 @@
[[package]]
name = "fp-rpc"
version = "3.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"ethereum-types",
@@ -2728,7 +2728,7 @@
[[package]]
name = "fp-self-contained"
version = "1.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"frame-support",
@@ -2744,7 +2744,7 @@
[[package]]
name = "fp-storage"
version = "2.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"parity-scale-codec 3.2.1",
]
@@ -3229,9 +3229,9 @@
[[package]]
name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -4099,7 +4099,7 @@
"bytes",
"futures 0.3.25",
"futures-timer",
- "getrandom 0.2.7",
+ "getrandom 0.2.8",
"instant",
"lazy_static",
"libp2p-autonat",
@@ -5685,7 +5685,7 @@
[[package]]
name = "pallet-base-fee"
version = "1.0.0"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"fp-evm",
"frame-support",
@@ -5901,7 +5901,7 @@
[[package]]
name = "pallet-ethereum"
version = "4.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"ethereum",
"ethereum-types",
@@ -5930,7 +5930,7 @@
[[package]]
name = "pallet-evm"
version = "6.0.0-dev"
-source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"
+source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
dependencies = [
"evm",
"fp-evm",
@@ -8572,9 +8572,9 @@
[[package]]
name = "prometheus"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c8babc29389186697fe5a2a4859d697825496b83db5d0b65271cdc0488e88c"
+checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
dependencies = [
"cfg-if 1.0.0",
"fnv",
@@ -8928,7 +8928,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.8",
]
[[package]]
@@ -9013,7 +9013,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom 0.2.8",
"redox_syscall",
"thiserror",
]
@@ -9153,9 +9153,9 @@
[[package]]
name = "rlp"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
dependencies = [
"bytes",
"rustc-hex",
@@ -10721,18 +10721,18 @@
[[package]]
name = "serde"
-version = "1.0.145"
+version = "1.0.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+checksum = "6df50b7a60a0ad48e1b42eb38373eac8ff785d619fb14db917b4e63d5439361f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.145"
+version = "1.0.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
+checksum = "a714fd32ba1d66047ce7d53dabd809e9922d538f9047de13cc4cffca47b36205"
dependencies = [
"proc-macro2",
"quote",
@@ -12002,9 +12002,9 @@
[[package]]
name = "syn"
-version = "1.0.102"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
dependencies = [
"proc-macro2",
"quote",
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}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);