difftreelog
fixup(imports): post-rebase
in: master
14 files changed
Cargo.tomldiffbeforeafterboth--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@
opt-level = 3
[profile.integration-tests]
+debug-assertions = true
inherits = "release"
-debug-assertions = true
[workspace.dependencies]
# Unique
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -32,20 +32,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use std::time::Duration;
-
-use codec::Encode;
-use cumulus_client_cli::generate_genesis_block;
use cumulus_primitives_core::ParaId;
-use log::{debug, info};
+use log::info;
use sc_cli::{
ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
- NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
+ NetworkParams, Result, SharedParams, SubstrateCli,
};
use sc_service::config::{BasePath, PrometheusConfig};
-use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
-use up_common::types::opaque::{Block, RuntimeId};
+use sp_runtime::traits::AccountIdConversion;
+use up_common::types::opaque::RuntimeId;
#[cfg(feature = "runtime-benchmarks")]
use crate::chain_spec::default_runtime;
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -824,8 +824,8 @@
{
use fc_consensus::FrontierBlockImport;
use sc_consensus_manual_seal::{
- run_manual_seal, run_delayed_finalize, EngineCommand, ManualSealParams,
- DelayedFinalizeParams,
+ run_delayed_finalize, run_manual_seal, DelayedFinalizeParams, EngineCommand,
+ ManualSealParams,
};
let sc_service::PartialComponents {
pallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/benchmarking.rs
+++ b/pallets/collator-selection/src/benchmarking.rs
@@ -35,15 +35,15 @@
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
use frame_support::{
assert_ok,
- parity_scale_codec::Decode,
traits::{
fungible::{Inspect, Mutate},
EnsureOrigin, Get,
},
};
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};
use pallet_authorship::EventHandler;
use pallet_session::{self as session, SessionManager};
+use parity_scale_codec::Decode;
use sp_std::prelude::*;
use super::*;
@@ -338,7 +338,7 @@
register_candidates::<T>(c);
let new_block: BlockNumberFor<T>= 1800u32.into();
- let zero_block: T::BlockNumber = 0u32.into();
+ let zero_block: BlockNumberFor<T> = 0u32.into();
let candidates = <Candidates<T>>::get();
let non_removals = c.saturating_sub(r);
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -54,9 +54,9 @@
extern crate alloc;
use core::{
+ marker::PhantomData,
ops::{Deref, DerefMut},
slice::from_ref,
- marker::PhantomData,
};
use evm_coder::ToLog;
pallets/configuration/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/configuration/src/benchmarking.rs
+++ b/pallets/configuration/src/benchmarking.rs
@@ -18,7 +18,7 @@
use frame_benchmarking::benchmarks;
use frame_support::assert_ok;
-use frame_system::{EventRecord, RawOrigin};
+use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};
use super::*;
pallets/inflation/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/inflation/src/benchmarking.rs
+++ b/pallets/inflation/src/benchmarking.rs
@@ -17,7 +17,7 @@
#![cfg(feature = "runtime-benchmarks")]
use frame_benchmarking::benchmarks;
-use frame_support::traits::OnInitialize;
+use frame_support::{pallet_prelude::*, traits::Hooks};
use super::*;
use crate::Pallet as Inflation;
@@ -25,9 +25,9 @@
benchmarks! {
on_initialize {
- let block1: T::BlockNumber = T::BlockNumber::from(1u32);
- let block2: T::BlockNumber = T::BlockNumber::from(2u32);
- Inflation::<T>::on_initialize(block1); // Create Treasury account
- }: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path
+ let block1: BlockNumberFor<T> = 1u32.into();
+ let block2: BlockNumberFor<T> = 2u32.into();
+ <Inflation<T> as Hooks>::on_initialize(block1); // Create Treasury account
+ }: { <Inflation<T> as Hooks>::on_initialize(block2); } // Benchmark deposit_into_existing path
}
pallets/nonfungible/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 frame_benchmarking::{account, benchmarks};18use pallet_common::{19 bench_init,20 benchmarking::{21 create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,22 },23 CommonCollectionOperations,24};25use sp_std::prelude::*;26use up_data_structs::{27 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,28 MAX_PROPERTIES_PER_ITEM,29};3031use super::*;32use crate::{Config, NonfungibleHandle, Pallet};3334const SEED: u32 = 1;3536fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {37 CreateItemData::<T> {38 owner,39 properties: Default::default(),40 }41}42fn create_max_item<T: Config>(43 collection: &NonfungibleHandle<T>,44 sender: &T::CrossAccountId,45 owner: T::CrossAccountId,46) -> Result<TokenId, DispatchError> {47 <Pallet<T>>::create_item(48 collection,49 sender,50 create_max_item_data::<T>(owner),51 &Unlimited,52 )?;53 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))54}5556fn create_collection<T: Config>(57 owner: T::CrossAccountId,58) -> Result<NonfungibleHandle<T>, DispatchError> {59 create_collection_raw(60 owner,61 CollectionMode::NFT,62 |owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),63 NonfungibleHandle::cast,64 )65}6667benchmarks! {68 create_item {69 bench_init!{70 owner: sub; collection: collection(owner);71 sender: cross_from_sub(owner); to: cross_sub;72 };73 }: {create_max_item(&collection, &sender, to.clone())?}7475 create_multiple_items {76 let b in 0..MAX_ITEMS_PER_BATCH;77 bench_init!{78 owner: sub; collection: collection(owner);79 sender: cross_from_sub(owner); to: cross_sub;80 };81 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();82 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8384 create_multiple_items_ex {85 let b in 0..MAX_ITEMS_PER_BATCH;86 bench_init!{87 owner: sub; collection: collection(owner);88 sender: cross_from_sub(owner);89 };90 let data = (0..b).map(|i| {91 bench_init!(to: cross_sub(i););92 create_max_item_data::<T>(to)93 }).collect();94 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9596 burn_item {97 bench_init!{98 owner: sub; collection: collection(owner);99 sender: cross_from_sub(owner); burner: cross_sub;100 };101 let item = create_max_item(&collection, &sender, burner.clone())?;102 }: {<Pallet<T>>::burn(&collection, &burner, item)?}103104 burn_recursively_self_raw {105 bench_init!{106 owner: sub; collection: collection(owner);107 sender: cross_from_sub(owner); burner: cross_sub;108 };109 let item = create_max_item(&collection, &sender, burner.clone())?;110 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}111112 burn_recursively_breadth_plus_self_plus_self_per_each_raw {113 let b in 0..200;114 bench_init!{115 owner: sub; collection: collection(owner);116 sender: cross_from_sub(owner); burner: cross_sub;117 };118 let item = create_max_item(&collection, &sender, burner.clone())?;119 for i in 0..b {120 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;121 }122 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}123124 transfer_raw {125 bench_init!{126 owner: sub; collection: collection(owner);127 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;128 };129 let item = create_max_item(&collection, &owner, sender.clone())?;130 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}131132 approve {133 bench_init!{134 owner: sub; collection: collection(owner);135 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;136 };137 let item = create_max_item(&collection, &owner, sender.clone())?;138 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}139140 approve_from {141 bench_init!{142 owner: sub; collection: collection(owner);143 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;144 };145 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());146 let item = create_max_item(&collection, &owner, owner_eth.clone())?;147 }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}148149 check_allowed_raw {150 bench_init!{151 owner: sub; collection: collection(owner);152 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;153 };154 let item = create_max_item(&collection, &owner, sender.clone())?;155 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;156 }: {<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?}157158 burn_from {159 bench_init!{160 owner: sub; collection: collection(owner);161 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;162 };163 let item = create_max_item(&collection, &owner, sender.clone())?;164 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;165 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}166167 set_token_property_permissions {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 perms = (0..b).map(|k| PropertyKeyPermission {174 key: property_key(k as usize),175 permission: PropertyPermission {176 mutable: false,177 collection_admin: false,178 token_owner: false,179 },180 }).collect::<Vec<_>>();181 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}182183 set_token_properties {184 let b in 0..MAX_PROPERTIES_PER_ITEM;185 bench_init!{186 owner: sub; collection: collection(owner);187 owner: cross_from_sub;188 };189 let perms = (0..b).map(|k| PropertyKeyPermission {190 key: property_key(k as usize),191 permission: PropertyPermission {192 mutable: false,193 collection_admin: true,194 token_owner: true,195 },196 }).collect::<Vec<_>>();197 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;198 let props = (0..b).map(|k| Property {199 key: property_key(k as usize),200 value: property_value(),201 }).collect::<Vec<_>>();202 let item = create_max_item(&collection, &owner, owner.clone())?;203 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}204205 init_token_properties {206 let b in 0..MAX_PROPERTIES_PER_ITEM;207 bench_init!{208 owner: sub; collection: collection(owner);209 owner: cross_from_sub;210 };211212 let perms = (0..b).map(|k| PropertyKeyPermission {213 key: property_key(k as usize),214 permission: PropertyPermission {215 mutable: false,216 collection_admin: true,217 token_owner: true,218 },219 }).collect::<Vec<_>>();220 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;221 let props = (0..b).map(|k| Property {222 key: property_key(k as usize),223 value: property_value(),224 }).collect::<Vec<_>>();225 let item = create_max_item(&collection, &owner, owner.clone())?;226227 let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);228 }: {229 let mut property_writer = pallet_common::collection_info_loaded_property_writer(230 &collection,231 is_collection_admin,232 property_permissions,233 );234235 property_writer.write_token_properties(236 true,237 item,238 props.into_iter(),239 crate::erc::ERC721TokenEvent::TokenChanged {240 token_id: item.into(),241 }242 .to_log(T::ContractAddress::get()),243 )?244 }245246 delete_token_properties {247 let b in 0..MAX_PROPERTIES_PER_ITEM;248 bench_init!{249 owner: sub; collection: collection(owner);250 owner: cross_from_sub;251 };252 let perms = (0..b).map(|k| PropertyKeyPermission {253 key: property_key(k as usize),254 permission: PropertyPermission {255 mutable: true,256 collection_admin: true,257 token_owner: true,258 },259 }).collect::<Vec<_>>();260 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;261 let props = (0..b).map(|k| Property {262 key: property_key(k as usize),263 value: property_value(),264 }).collect::<Vec<_>>();265 let item = create_max_item(&collection, &owner, owner.clone())?;266 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;267 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();268 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}269270 token_owner {271 bench_init!{272 owner: sub; collection: collection(owner);273 owner: cross_from_sub;274 };275 let item = create_max_item(&collection, &owner, owner.clone())?;276 }: {collection.token_owner(item).unwrap()}277278 set_allowance_for_all {279 bench_init!{280 owner: sub; collection: collection(owner); owner: cross_from_sub;281 operator: cross_sub;282 };283 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}284285 allowance_for_all {286 bench_init!{287 owner: sub; collection: collection(owner); owner: cross_from_sub;288 operator: cross_sub;289 };290 }: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}291292 repair_item {293 bench_init!{294 owner: sub; collection: collection(owner);295 owner: cross_from_sub;296 };297 let item = create_max_item(&collection, &owner, owner.clone())?;298 }: {<Pallet<T>>::repair_item(&collection, item)?}299}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 frame_benchmarking::{account, benchmarks};18use pallet_common::{19 bench_init,20 benchmarking::{21 create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,22 },23 CommonCollectionOperations,24};25use sp_std::prelude::*;26use up_data_structs::{27 budget::Unlimited, CollectionMode, PropertyPermission, MAX_ITEMS_PER_BATCH,28 MAX_PROPERTIES_PER_ITEM,29};3031use super::*;32use crate::{Config, NonfungibleHandle, Pallet};3334const SEED: u32 = 1;3536fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {37 CreateItemData::<T> {38 owner,39 properties: Default::default(),40 }41}42fn create_max_item<T: Config>(43 collection: &NonfungibleHandle<T>,44 sender: &T::CrossAccountId,45 owner: T::CrossAccountId,46) -> Result<TokenId, DispatchError> {47 <Pallet<T>>::create_item(48 collection,49 sender,50 create_max_item_data::<T>(owner),51 &Unlimited,52 )?;53 Ok(TokenId(<TokensMinted<T>>::get(collection.id)))54}5556fn create_collection<T: Config>(57 owner: T::CrossAccountId,58) -> Result<NonfungibleHandle<T>, DispatchError> {59 create_collection_raw(60 owner,61 CollectionMode::NFT,62 |owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),63 NonfungibleHandle::cast,64 )65}6667benchmarks! {68 create_item {69 bench_init!{70 owner: sub; collection: collection(owner);71 sender: cross_from_sub(owner); to: cross_sub;72 };73 }: {create_max_item(&collection, &sender, to.clone())?}7475 create_multiple_items {76 let b in 0..MAX_ITEMS_PER_BATCH;77 bench_init!{78 owner: sub; collection: collection(owner);79 sender: cross_from_sub(owner); to: cross_sub;80 };81 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();82 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8384 create_multiple_items_ex {85 let b in 0..MAX_ITEMS_PER_BATCH;86 bench_init!{87 owner: sub; collection: collection(owner);88 sender: cross_from_sub(owner);89 };90 let data = (0..b).map(|i| {91 bench_init!(to: cross_sub(i););92 create_max_item_data::<T>(to)93 }).collect();94 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9596 burn_item {97 bench_init!{98 owner: sub; collection: collection(owner);99 sender: cross_from_sub(owner); burner: cross_sub;100 };101 let item = create_max_item(&collection, &sender, burner.clone())?;102 }: {<Pallet<T>>::burn(&collection, &burner, item)?}103104 burn_recursively_self_raw {105 bench_init!{106 owner: sub; collection: collection(owner);107 sender: cross_from_sub(owner); burner: cross_sub;108 };109 let item = create_max_item(&collection, &sender, burner.clone())?;110 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}111112 burn_recursively_breadth_plus_self_plus_self_per_each_raw {113 let b in 0..200;114 bench_init!{115 owner: sub; collection: collection(owner);116 sender: cross_from_sub(owner); burner: cross_sub;117 };118 let item = create_max_item(&collection, &sender, burner.clone())?;119 for i in 0..b {120 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;121 }122 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}123124 transfer_raw {125 bench_init!{126 owner: sub; collection: collection(owner);127 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;128 };129 let item = create_max_item(&collection, &owner, sender.clone())?;130 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}131132 approve {133 bench_init!{134 owner: sub; collection: collection(owner);135 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;136 };137 let item = create_max_item(&collection, &owner, sender.clone())?;138 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}139140 approve_from {141 bench_init!{142 owner: sub; collection: collection(owner);143 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;144 };145 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());146 let item = create_max_item(&collection, &owner, owner_eth.clone())?;147 }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}148149 check_allowed_raw {150 bench_init!{151 owner: sub; collection: collection(owner);152 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;153 };154 let item = create_max_item(&collection, &owner, sender.clone())?;155 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;156 }: {<Pallet<T>>::check_allowed(&collection, &spender, &sender, item, &Unlimited)?}157158 burn_from {159 bench_init!{160 owner: sub; collection: collection(owner);161 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;162 };163 let item = create_max_item(&collection, &owner, sender.clone())?;164 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;165 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}166167 set_token_property_permissions {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 perms = (0..b).map(|k| PropertyKeyPermission {174 key: property_key(k as usize),175 permission: PropertyPermission {176 mutable: false,177 collection_admin: false,178 token_owner: false,179 },180 }).collect::<Vec<_>>();181 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}182183 set_token_properties {184 let b in 0..MAX_PROPERTIES_PER_ITEM;185 bench_init!{186 owner: sub; collection: collection(owner);187 owner: cross_from_sub;188 };189 let perms = (0..b).map(|k| PropertyKeyPermission {190 key: property_key(k as usize),191 permission: PropertyPermission {192 mutable: false,193 collection_admin: true,194 token_owner: true,195 },196 }).collect::<Vec<_>>();197 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;198 let props = (0..b).map(|k| Property {199 key: property_key(k as usize),200 value: property_value(),201 }).collect::<Vec<_>>();202 let item = create_max_item(&collection, &owner, owner.clone())?;203 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?}204205 init_token_properties {206 let b in 0..MAX_PROPERTIES_PER_ITEM;207 bench_init!{208 owner: sub; collection: collection(owner);209 owner: cross_from_sub;210 };211212 let perms = (0..b).map(|k| PropertyKeyPermission {213 key: property_key(k as usize),214 permission: PropertyPermission {215 mutable: false,216 collection_admin: true,217 token_owner: true,218 },219 }).collect::<Vec<_>>();220 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;221 let props = (0..b).map(|k| Property {222 key: property_key(k as usize),223 value: property_value(),224 }).collect::<Vec<_>>();225 let item = create_max_item(&collection, &owner, owner.clone())?;226227 let (is_collection_admin, property_permissions) = load_is_admin_and_property_permissions(&collection, &owner);228 }: {229 let mut property_writer = pallet_common::collection_info_loaded_property_writer(230 &collection,231 is_collection_admin,232 property_permissions,233 );234235 property_writer.write_token_properties(236 true,237 item,238 props.into_iter(),239 crate::erc::ERC721TokenEvent::TokenChanged {240 token_id: item.into(),241 }242 .to_log(T::ContractAddress::get()),243 )?244 }245246 delete_token_properties {247 let b in 0..MAX_PROPERTIES_PER_ITEM;248 bench_init!{249 owner: sub; collection: collection(owner);250 owner: cross_from_sub;251 };252 let perms = (0..b).map(|k| PropertyKeyPermission {253 key: property_key(k as usize),254 permission: PropertyPermission {255 mutable: true,256 collection_admin: true,257 token_owner: true,258 },259 }).collect::<Vec<_>>();260 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;261 let props = (0..b).map(|k| Property {262 key: property_key(k as usize),263 value: property_value(),264 }).collect::<Vec<_>>();265 let item = create_max_item(&collection, &owner, owner.clone())?;266 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), &Unlimited)?;267 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();268 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}269270 token_owner {271 bench_init!{272 owner: sub; collection: collection(owner);273 owner: cross_from_sub;274 };275 let item = create_max_item(&collection, &owner, owner.clone())?;276 }: {collection.token_owner(item).unwrap()}277278 set_allowance_for_all {279 bench_init!{280 owner: sub; collection: collection(owner); owner: cross_from_sub;281 operator: cross_sub;282 };283 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}284285 allowance_for_all {286 bench_init!{287 owner: sub; collection: collection(owner); owner: cross_from_sub;288 operator: cross_sub;289 };290 }: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}291292 repair_item {293 bench_init!{294 owner: sub; collection: collection(owner);295 owner: cross_from_sub;296 };297 let item = create_max_item(&collection, &owner, owner.clone())?;298 }: {<Pallet<T>>::repair_item(&collection, item)?}299}pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -103,9 +103,9 @@
};
pub use pallet::*;
use pallet_common::{
- Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,
- eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,
- weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info,
+ eth::collection_id_to_address, helpers::add_weight_to_post_info,
+ weights::WeightInfo as CommonWeightInfo, CollectionHandle, Error as CommonError,
+ Event as CommonEvent, Pallet as PalletCommon, SelfWeightOf as PalletCommonWeightOf,
};
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
@@ -116,9 +116,9 @@
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
use up_data_structs::{
- AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
- mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue,
- PropertyKeyPermission, PropertyScope, TokenChild, AuxPropertyValue, PropertiesPermissionMap,
+ budget::Budget, mapping::TokenAddressMapping, AccessMode, AuxPropertyValue, CollectionId,
+ CreateCollectionData, CreateNftExData, CustomDataLimit, PropertiesPermissionMap, Property,
+ PropertyKey, PropertyKeyPermission, PropertyScope, PropertyValue, TokenChild, TokenId,
TokenProperties as TokenPropertiesT,
};
use weights::WeightInfo;
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -20,7 +20,7 @@
use pallet_common::{
bench_init,
benchmarking::{
- create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,
+ create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,
},
};
use sp_std::prelude::*;
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -106,7 +106,7 @@
budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,
CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,
PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,
- TokenProperties as TokenPropertiesT, TrySetProperty, MAX_REFUNGIBLE_PIECES,
+ TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES,
};
use crate::{erc::ERC721Events, erc_token::ERC20Events};
runtime/opal/src/xcm_barrier.rsdiffbeforeafterboth--- a/runtime/opal/src/xcm_barrier.rs
+++ b/runtime/opal/src/xcm_barrier.rs
@@ -15,8 +15,10 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use frame_support::{match_types, traits::Everything};
-use xcm::latest::{Junctions::*, MultiLocation};
-use staging_xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit, AllowExplicitUnpaidExecutionFrom};
+use staging_xcm::latest::{Junctions::*, MultiLocation};
+use staging_xcm_builder::{
+ AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+};
match_types! {
pub type ParentOnly: impl Contains<MultiLocation> = {
runtime/quartz/src/xcm_barrier.rsdiffbeforeafterboth--- a/runtime/quartz/src/xcm_barrier.rs
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -17,8 +17,8 @@
use frame_support::{match_types, traits::Everything};
use staging_xcm::latest::{Junctions::*, MultiLocation};
use staging_xcm_builder::{
- AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,
+ AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
+ AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
};
use crate::PolkadotXcm;
runtime/unique/src/xcm_barrier.rsdiffbeforeafterboth--- a/runtime/unique/src/xcm_barrier.rs
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -17,8 +17,8 @@
use frame_support::{match_types, traits::Everything};
use staging_xcm::latest::{Junctions::*, MultiLocation};
use staging_xcm_builder::{
- AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
- AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,
+ AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
+ AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
};
use crate::PolkadotXcm;