git.delta.rocks / unique-network / refs/commits / 2c03632a3633

difftreelog

chore rename `set_allowance_for` to `set_allowance_from`

Grigoriy Simonov2023-01-09parent: #90bf3a3.patch.diff
in: master

9 files changed

modifiedpallets/fungible/src/benchmarking.rsdiffbeforeafterboth
before · pallets/fungible/src/benchmarking.rs
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, FungibleHandle};1920use sp_std::prelude::*;21use pallet_common::benchmarking::create_collection_raw;22use frame_benchmarking::{benchmarks, account};23use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, budget::Unlimited};24use pallet_common::bench_init;2526const SEED: u32 = 1;2728fn create_collection<T: Config>(29	owner: T::CrossAccountId,30) -> Result<FungibleHandle<T>, DispatchError> {31	create_collection_raw(32		owner,33		CollectionMode::Fungible(0),34		|owner: T::CrossAccountId, data| {35			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())36		},37		FungibleHandle::cast,38	)39}4041benchmarks! {42	create_item {43		bench_init!{44			owner: sub; collection: collection(owner);45			sender: cross_from_sub(owner); to: cross_sub;46		};47	}: {<Pallet<T>>::create_item(&collection, &sender, (to, 200), &Unlimited)?}4849	create_multiple_items_ex {50		let b in 0..MAX_ITEMS_PER_BATCH;51		bench_init!{52			owner: sub; collection: collection(owner);53			sender: cross_from_sub(owner);54		};55		let data = (0..b).map(|i| {56			bench_init!(to: cross_sub(i););57			(to, 200)58		}).collect::<BTreeMap<_, _>>().try_into().unwrap();59	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}6061	burn_item {62		bench_init!{63			owner: sub; collection: collection(owner);64			owner: cross_from_sub; burner: cross_sub;65		};66		<Pallet<T>>::create_item(&collection, &owner, (burner.clone(), 200), &Unlimited)?;67	}: {<Pallet<T>>::burn(&collection, &burner, 100)?}6869	transfer {70		bench_init!{71			owner: sub; collection: collection(owner);72			owner: cross_from_sub; sender: cross_sub; to: cross_sub;73		};74		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;75	}: {<Pallet<T>>::transfer(&collection, &sender, &to, 200, &Unlimited)?}7677	approve {78		bench_init!{79			owner: sub; collection: collection(owner);80			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;81		};82		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;83	}: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, 100)?}8485	approve_from {86		bench_init!{87			owner: sub; collection: collection(owner);88			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;8990		};91		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());92		<Pallet<T>>::create_item(&collection, &owner, (owner_eth.clone(), 200), &Unlimited)?;93	}: {<Pallet<T>>::set_allowance_for(&collection, &sender, &owner_eth, &spender, 100)?}9495	transfer_from {96		bench_init!{97			owner: sub; collection: collection(owner);98			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;99		};100		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;101		<Pallet<T>>::set_allowance(&collection, &sender, &spender, 200)?;102	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, 100, &Unlimited)?}103104	burn_from {105		bench_init!{106			owner: sub; collection: collection(owner);107			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;108		};109		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;110		<Pallet<T>>::set_allowance(&collection, &sender, &burner, 200)?;111	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, 100, &Unlimited)?}112}
after · pallets/fungible/src/benchmarking.rs
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, FungibleHandle};1920use sp_std::prelude::*;21use pallet_common::benchmarking::create_collection_raw;22use frame_benchmarking::{benchmarks, account};23use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, budget::Unlimited};24use pallet_common::bench_init;2526const SEED: u32 = 1;2728fn create_collection<T: Config>(29	owner: T::CrossAccountId,30) -> Result<FungibleHandle<T>, DispatchError> {31	create_collection_raw(32		owner,33		CollectionMode::Fungible(0),34		|owner: T::CrossAccountId, data| {35			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())36		},37		FungibleHandle::cast,38	)39}4041benchmarks! {42	create_item {43		bench_init!{44			owner: sub; collection: collection(owner);45			sender: cross_from_sub(owner); to: cross_sub;46		};47	}: {<Pallet<T>>::create_item(&collection, &sender, (to, 200), &Unlimited)?}4849	create_multiple_items_ex {50		let b in 0..MAX_ITEMS_PER_BATCH;51		bench_init!{52			owner: sub; collection: collection(owner);53			sender: cross_from_sub(owner);54		};55		let data = (0..b).map(|i| {56			bench_init!(to: cross_sub(i););57			(to, 200)58		}).collect::<BTreeMap<_, _>>().try_into().unwrap();59	}: {<Pallet<T>>::create_multiple_items(&collection, &sender, data, &Unlimited)?}6061	burn_item {62		bench_init!{63			owner: sub; collection: collection(owner);64			owner: cross_from_sub; burner: cross_sub;65		};66		<Pallet<T>>::create_item(&collection, &owner, (burner.clone(), 200), &Unlimited)?;67	}: {<Pallet<T>>::burn(&collection, &burner, 100)?}6869	transfer {70		bench_init!{71			owner: sub; collection: collection(owner);72			owner: cross_from_sub; sender: cross_sub; to: cross_sub;73		};74		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;75	}: {<Pallet<T>>::transfer(&collection, &sender, &to, 200, &Unlimited)?}7677	approve {78		bench_init!{79			owner: sub; collection: collection(owner);80			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;81		};82		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;83	}: {<Pallet<T>>::set_allowance(&collection, &sender, &spender, 100)?}8485	approve_from {86		bench_init!{87			owner: sub; collection: collection(owner);88			owner: cross_from_sub; sender: cross_sub; spender: cross_sub;8990		};91		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());92		<Pallet<T>>::create_item(&collection, &owner, (owner_eth.clone(), 200), &Unlimited)?;93	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, &spender, 100)?}9495	transfer_from {96		bench_init!{97			owner: sub; collection: collection(owner);98			owner: cross_from_sub; sender: cross_sub; spender: cross_sub; receiver: cross_sub;99		};100		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;101		<Pallet<T>>::set_allowance(&collection, &sender, &spender, 200)?;102	}: {<Pallet<T>>::transfer_from(&collection, &spender, &sender, &receiver, 100, &Unlimited)?}103104	burn_from {105		bench_init!{106			owner: sub; collection: collection(owner);107			owner: cross_from_sub; sender: cross_sub; burner: cross_sub;108		};109		<Pallet<T>>::create_item(&collection, &owner, (sender.clone(), 200), &Unlimited)?;110		<Pallet<T>>::set_allowance(&collection, &sender, &burner, 200)?;111	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, 100, &Unlimited)?}112}
modifiedpallets/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(),
 		)
 	}
modifiedpallets/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,
modifiedpallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -141,7 +141,7 @@
 		};
 		let owner_eth = T::CrossAccountId::from_eth(*sender.as_eth());
 		let item = create_max_item(&collection, &owner, owner_eth.clone())?;
-	}: {<Pallet<T>>::set_allowance_for(&collection, &sender, &owner_eth, item, Some(&spender))?}
+	}: {<Pallet<T>>::set_allowance_from(&collection, &sender, &owner_eth, item, Some(&spender))?}
 
 	transfer_from {
 		bench_init!{
modifiedpallets/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(),
 		)
modifiedpallets/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,
modifiedpallets/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!{
modifiedpallets/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(),
 		)
 	}
modifiedpallets/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,