difftreelog
chore rename `set_allowance_for` to `set_allowance_from`
in: master
9 files changed
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -90,7 +90,7 @@
};
let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());
<Pallet<T>>::create_item(&collection, &owner, (owner_eth.clone(), 200), &Unlimited)?;
- }: {<Pallet<T>>::set_allowance_for(&collection, &sender, &owner_eth, &spender, 100)?}
+ }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, 100)?}
transfer_from {
bench_init!{
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -272,7 +272,7 @@
);
with_weight(
- <Pallet<T>>::set_allowance_for(self, &sender, &from, &to, amount),
+ <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, amount),
<CommonWeights<T>>::approve_from(),
)
}
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -620,7 +620,7 @@
/// - `from`: Owner's eth mirror.
/// - `to`: Recipient of the allowance rights.
/// - `amount`: Amount of tokens the spender is allowed to `transfer` or `burn`.
- pub fn set_allowance_for(
+ pub fn set_allowance_from(
collection: &FungibleHandle<T>,
sender: &T::CrossAccountId,
from: &T::CrossAccountId,
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 super::*;18use crate::{Pallet, Config, NonfungibleHandle};1920use frame_benchmarking::{benchmarks, account};21use pallet_common::{22 bench_init,23 benchmarking::{create_collection_raw, property_key, property_value},24 CommonCollectionOperations,25};26use sp_std::prelude::*;27use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};2829const SEED: u32 = 1;3031fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {32 CreateItemData::<T> {33 owner,34 properties: Default::default(),35 }36}37fn create_max_item<T: Config>(38 collection: &NonfungibleHandle<T>,39 sender: &T::CrossAccountId,40 owner: T::CrossAccountId,41) -> Result<TokenId, DispatchError> {42 <Pallet<T>>::create_item(43 &collection,44 sender,45 create_max_item_data::<T>(owner),46 &Unlimited,47 )?;48 Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))49}5051fn create_collection<T: Config>(52 owner: T::CrossAccountId,53) -> Result<NonfungibleHandle<T>, DispatchError> {54 create_collection_raw(55 owner,56 CollectionMode::NFT,57 |owner: T::CrossAccountId, data| {58 <Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())59 },60 NonfungibleHandle::cast,61 )62}6364benchmarks! {65 create_item {66 bench_init!{67 owner: sub; collection: collection(owner);68 sender: cross_from_sub(owner); to: cross_sub;69 };70 }: {create_max_item(&collection, &sender, to.clone())?}7172 create_multiple_items {73 let b in 0..MAX_ITEMS_PER_BATCH;74 bench_init!{75 owner: sub; collection: collection(owner);76 sender: cross_from_sub(owner); to: cross_sub;77 };78 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();79 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8081 create_multiple_items_ex {82 let b in 0..MAX_ITEMS_PER_BATCH;83 bench_init!{84 owner: sub; collection: collection(owner);85 sender: cross_from_sub(owner);86 };87 let data = (0..b).map(|i| {88 bench_init!(to: cross_sub(i););89 create_max_item_data::<T>(to)90 }).collect();91 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9293 burn_item {94 bench_init!{95 owner: sub; collection: collection(owner);96 sender: cross_from_sub(owner); burner: cross_sub;97 };98 let item = create_max_item(&collection, &sender, burner.clone())?;99 }: {<Pallet<T>>::burn(&collection, &burner, item)?}100101 burn_recursively_self_raw {102 bench_init!{103 owner: sub; collection: collection(owner);104 sender: cross_from_sub(owner); burner: cross_sub;105 };106 let item = create_max_item(&collection, &sender, burner.clone())?;107 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}108109 burn_recursively_breadth_plus_self_plus_self_per_each_raw {110 let b in 0..200;111 bench_init!{112 owner: sub; collection: collection(owner);113 sender: cross_from_sub(owner); burner: cross_sub;114 };115 let item = create_max_item(&collection, &sender, burner.clone())?;116 for i in 0..b {117 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;118 }119 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}120121 transfer {122 bench_init!{123 owner: sub; collection: collection(owner);124 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;125 };126 let item = create_max_item(&collection, &owner, sender.clone())?;127 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}128129 approve {130 bench_init!{131 owner: sub; collection: collection(owner);132 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;133 };134 let item = create_max_item(&collection, &owner, sender.clone())?;135 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}136137 approve_from {138 bench_init!{139 owner: sub; collection: collection(owner);140 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;141 };142 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());143 let item = create_max_item(&collection, &owner, owner_eth.clone())?;144 }: {<Pallet<T>>::set_allowance_for(&collection, &sender, &owner_eth, item, Some(&spender))?}145146 transfer_from {147 bench_init!{148 owner: sub; collection: collection(owner);149 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;150 };151 let item = create_max_item(&collection, &owner, sender.clone())?;152 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;153 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}154155 burn_from {156 bench_init!{157 owner: sub; collection: collection(owner);158 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;159 };160 let item = create_max_item(&collection, &owner, sender.clone())?;161 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;162 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}163164 set_token_property_permissions {165 let b in 0..MAX_PROPERTIES_PER_ITEM;166 bench_init!{167 owner: sub; collection: collection(owner);168 owner: cross_from_sub;169 };170 let perms = (0..b).map(|k| PropertyKeyPermission {171 key: property_key(k as usize),172 permission: PropertyPermission {173 mutable: false,174 collection_admin: false,175 token_owner: false,176 },177 }).collect::<Vec<_>>();178 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}179180 set_token_properties {181 let b in 0..MAX_PROPERTIES_PER_ITEM;182 bench_init!{183 owner: sub; collection: collection(owner);184 owner: cross_from_sub;185 };186 let perms = (0..b).map(|k| PropertyKeyPermission {187 key: property_key(k as usize),188 permission: PropertyPermission {189 mutable: false,190 collection_admin: true,191 token_owner: true,192 },193 }).collect::<Vec<_>>();194 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;195 let props = (0..b).map(|k| Property {196 key: property_key(k as usize),197 value: property_value(),198 }).collect::<Vec<_>>();199 let item = create_max_item(&collection, &owner, owner.clone())?;200 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}201202 delete_token_properties {203 let b in 0..MAX_PROPERTIES_PER_ITEM;204 bench_init!{205 owner: sub; collection: collection(owner);206 owner: cross_from_sub;207 };208 let perms = (0..b).map(|k| PropertyKeyPermission {209 key: property_key(k as usize),210 permission: PropertyPermission {211 mutable: true,212 collection_admin: true,213 token_owner: true,214 },215 }).collect::<Vec<_>>();216 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;217 let props = (0..b).map(|k| Property {218 key: property_key(k as usize),219 value: property_value(),220 }).collect::<Vec<_>>();221 let item = create_max_item(&collection, &owner, owner.clone())?;222 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;223 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();224 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}225226 token_owner {227 bench_init!{228 owner: sub; collection: collection(owner);229 owner: cross_from_sub;230 };231 let item = create_max_item(&collection, &owner, owner.clone())?;232233 }: {collection.token_owner(item)}234235 set_allowance_for_all {236 bench_init!{237 owner: sub; collection: collection(owner); owner: cross_from_sub;238 operator: cross_sub;239 };240 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}241242 allowance_for_all {243 bench_init!{244 owner: sub; collection: collection(owner); owner: cross_from_sub;245 operator: cross_sub;246 };247 }: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}248249 repair_item {250 bench_init!{251 owner: sub; collection: collection(owner);252 owner: cross_from_sub;253 };254 let item = create_max_item(&collection, &owner, owner.clone())?;255 }: {<Pallet<T>>::repair_item(&collection, item)?}256}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, NonfungibleHandle};1920use frame_benchmarking::{benchmarks, account};21use pallet_common::{22 bench_init,23 benchmarking::{create_collection_raw, property_key, property_value},24 CommonCollectionOperations,25};26use sp_std::prelude::*;27use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};2829const SEED: u32 = 1;3031fn create_max_item_data<T: Config>(owner: T::CrossAccountId) -> CreateItemData<T> {32 CreateItemData::<T> {33 owner,34 properties: Default::default(),35 }36}37fn create_max_item<T: Config>(38 collection: &NonfungibleHandle<T>,39 sender: &T::CrossAccountId,40 owner: T::CrossAccountId,41) -> Result<TokenId, DispatchError> {42 <Pallet<T>>::create_item(43 &collection,44 sender,45 create_max_item_data::<T>(owner),46 &Unlimited,47 )?;48 Ok(TokenId(<TokensMinted<T>>::get(&collection.id)))49}5051fn create_collection<T: Config>(52 owner: T::CrossAccountId,53) -> Result<NonfungibleHandle<T>, DispatchError> {54 create_collection_raw(55 owner,56 CollectionMode::NFT,57 |owner: T::CrossAccountId, data| {58 <Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())59 },60 NonfungibleHandle::cast,61 )62}6364benchmarks! {65 create_item {66 bench_init!{67 owner: sub; collection: collection(owner);68 sender: cross_from_sub(owner); to: cross_sub;69 };70 }: {create_max_item(&collection, &sender, to.clone())?}7172 create_multiple_items {73 let b in 0..MAX_ITEMS_PER_BATCH;74 bench_init!{75 owner: sub; collection: collection(owner);76 sender: cross_from_sub(owner); to: cross_sub;77 };78 let data = (0..b).map(|_| create_max_item_data::<T>(to.clone())).collect();79 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}8081 create_multiple_items_ex {82 let b in 0..MAX_ITEMS_PER_BATCH;83 bench_init!{84 owner: sub; collection: collection(owner);85 sender: cross_from_sub(owner);86 };87 let data = (0..b).map(|i| {88 bench_init!(to: cross_sub(i););89 create_max_item_data::<T>(to)90 }).collect();91 }: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}9293 burn_item {94 bench_init!{95 owner: sub; collection: collection(owner);96 sender: cross_from_sub(owner); burner: cross_sub;97 };98 let item = create_max_item(&collection, &sender, burner.clone())?;99 }: {<Pallet<T>>::burn(&collection, &burner, item)?}100101 burn_recursively_self_raw {102 bench_init!{103 owner: sub; collection: collection(owner);104 sender: cross_from_sub(owner); burner: cross_sub;105 };106 let item = create_max_item(&collection, &sender, burner.clone())?;107 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}108109 burn_recursively_breadth_plus_self_plus_self_per_each_raw {110 let b in 0..200;111 bench_init!{112 owner: sub; collection: collection(owner);113 sender: cross_from_sub(owner); burner: cross_sub;114 };115 let item = create_max_item(&collection, &sender, burner.clone())?;116 for i in 0..b {117 create_max_item(&collection, &sender, T::CrossTokenAddressMapping::token_to_address(collection.id, item))?;118 }119 }: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}120121 transfer {122 bench_init!{123 owner: sub; collection: collection(owner);124 owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;125 };126 let item = create_max_item(&collection, &owner, sender.clone())?;127 }: {<Pallet<T>>::transfer(&collection, &sender, &receiver, item, &Unlimited)?}128129 approve {130 bench_init!{131 owner: sub; collection: collection(owner);132 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;133 };134 let item = create_max_item(&collection, &owner, sender.clone())?;135 }: {<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?}136137 approve_from {138 bench_init!{139 owner: sub; collection: collection(owner);140 owner: cross_from_sub; sender: cross_sub; spender: cross_sub;141 };142 let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());143 let item = create_max_item(&collection, &owner, owner_eth.clone())?;144 }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}145146 transfer_from {147 bench_init!{148 owner: sub; collection: collection(owner);149 owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;150 };151 let item = create_max_item(&collection, &owner, sender.clone())?;152 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&spender))?;153 }: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, item, &Unlimited)?}154155 burn_from {156 bench_init!{157 owner: sub; collection: collection(owner);158 owner: cross_from_sub; sender: cross_sub; burner: cross_sub;159 };160 let item = create_max_item(&collection, &owner, sender.clone())?;161 <Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;162 }: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}163164 set_token_property_permissions {165 let b in 0..MAX_PROPERTIES_PER_ITEM;166 bench_init!{167 owner: sub; collection: collection(owner);168 owner: cross_from_sub;169 };170 let perms = (0..b).map(|k| PropertyKeyPermission {171 key: property_key(k as usize),172 permission: PropertyPermission {173 mutable: false,174 collection_admin: false,175 token_owner: false,176 },177 }).collect::<Vec<_>>();178 }: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}179180 set_token_properties {181 let b in 0..MAX_PROPERTIES_PER_ITEM;182 bench_init!{183 owner: sub; collection: collection(owner);184 owner: cross_from_sub;185 };186 let perms = (0..b).map(|k| PropertyKeyPermission {187 key: property_key(k as usize),188 permission: PropertyPermission {189 mutable: false,190 collection_admin: true,191 token_owner: true,192 },193 }).collect::<Vec<_>>();194 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;195 let props = (0..b).map(|k| Property {196 key: property_key(k as usize),197 value: property_value(),198 }).collect::<Vec<_>>();199 let item = create_max_item(&collection, &owner, owner.clone())?;200 }: {<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?}201202 delete_token_properties {203 let b in 0..MAX_PROPERTIES_PER_ITEM;204 bench_init!{205 owner: sub; collection: collection(owner);206 owner: cross_from_sub;207 };208 let perms = (0..b).map(|k| PropertyKeyPermission {209 key: property_key(k as usize),210 permission: PropertyPermission {211 mutable: true,212 collection_admin: true,213 token_owner: true,214 },215 }).collect::<Vec<_>>();216 <Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;217 let props = (0..b).map(|k| Property {218 key: property_key(k as usize),219 value: property_value(),220 }).collect::<Vec<_>>();221 let item = create_max_item(&collection, &owner, owner.clone())?;222 <Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;223 let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();224 }: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}225226 token_owner {227 bench_init!{228 owner: sub; collection: collection(owner);229 owner: cross_from_sub;230 };231 let item = create_max_item(&collection, &owner, owner.clone())?;232233 }: {collection.token_owner(item)}234235 set_allowance_for_all {236 bench_init!{237 owner: sub; collection: collection(owner); owner: cross_from_sub;238 operator: cross_sub;239 };240 }: {<Pallet<T>>::set_allowance_for_all(&collection, &owner, &operator, true)?}241242 allowance_for_all {243 bench_init!{244 owner: sub; collection: collection(owner); owner: cross_from_sub;245 operator: cross_sub;246 };247 }: {<Pallet<T>>::allowance_for_all(&collection, &owner, &operator)}248249 repair_item {250 bench_init!{251 owner: sub; collection: collection(owner);252 owner: cross_from_sub;253 };254 let item = create_max_item(&collection, &owner, owner.clone())?;255 }: {<Pallet<T>>::repair_item(&collection, item)?}256}pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -369,9 +369,9 @@
with_weight(
if amount == 1 {
- <Pallet<T>>::set_allowance_for(self, &sender, &from, token, Some(&to))
+ <Pallet<T>>::set_allowance_from(self, &sender, &from, token, Some(&to))
} else {
- <Pallet<T>>::set_allowance_for(self, &sender, &from, token, None)
+ <Pallet<T>>::set_allowance_from(self, &sender, &from, token, None)
},
<CommonWeights<T>>::approve_from(),
)
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -1176,7 +1176,7 @@
/// - `from`: Address of sender's eth mirror.
/// - `to`: Adress of spender.
/// - `token`: Token the spender is allowed to `transfer` or `burn`.
- pub fn set_allowance_for(
+ pub fn set_allowance_from(
collection: &NonfungibleHandle<T>,
sender: &T::CrossAccountId,
from: &T::CrossAccountId,
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -170,7 +170,7 @@
};
let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());
let item = create_max_item(&collection, &owner, [(owner_eth.clone(), 200)])?;
- }: {<Pallet<T>>::set_allowance_for(&collection, &sender, &owner_eth, &spender, item, 100)?}
+ }: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, item, 100)?}
transfer_from_normal {
bench_init!{
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -327,7 +327,7 @@
amount: u128,
) -> DispatchResultWithPostInfo {
with_weight(
- <Pallet<T>>::set_allowance_for(self, &sender, &from, &to, token_id, amount),
+ <Pallet<T>>::set_allowance_from(self, &sender, &from, &to, token_id, amount),
<CommonWeights<T>>::approve_from(),
)
}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1107,7 +1107,7 @@
/// - `from`: Address of sender's eth mirror.
/// - `to`: Adress of spender.
/// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.
- pub fn set_allowance_for(
+ pub fn set_allowance_from(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
from: &T::CrossAccountId,