git.delta.rocks / unique-network / refs/commits / 87f464dc41c1

difftreelog

feat switch `inflation` from `Currency` trait to `fungible::*` traits fix: benchmarks

Grigoriy Simonov2023-05-23parent: #d516d14.patch.diff
in: master

5 files changed

modifiedpallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth
before · pallets/app-promotion/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/>.1617#![cfg(feature = "runtime-benchmarks")]1819use super::*;20use crate::Pallet as PromototionPallet;2122use sp_runtime::traits::Bounded;2324use frame_benchmarking::{benchmarks, account};25use frame_support::traits::OnInitialize;26use frame_system::RawOrigin;27use pallet_unique::benchmarking::create_nft_collection;28use pallet_evm_migration::Pallet as EvmMigrationPallet;2930const SEED: u32 = 0;3132fn set_admin<T>() -> Result<T::AccountId, sp_runtime::DispatchError>33where34	T: Config + pallet_unique::Config + pallet_evm_migration::Config,35	T::BlockNumber: From<u32> + Into<u32>,36	<<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,37{38	let pallet_admin = account::<T::AccountId>("admin", 0, SEED);3940	<T as Config>::Currency::make_free_balance_be(41		&pallet_admin,42		Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),43	);4445	PromototionPallet::<T>::set_admin_address(46		RawOrigin::Root.into(),47		T::CrossAccountId::from_sub(pallet_admin.clone()),48	)?;4950	Ok(pallet_admin)51}5253benchmarks! {54	where_clause{55		where T:  Config + pallet_unique::Config + pallet_evm_migration::Config ,56		T::BlockNumber: From<u32> + Into<u32>,57		<<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>58	}5960	on_initialize {61		let b in 0..PENDING_LIMIT_PER_BLOCK;62		set_admin::<T>()?;6364		(0..b).try_for_each(|index| {65			let staker = account::<T::AccountId>("staker", index, SEED);66			<T as Config>::Currency::make_free_balance_be(&staker,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());67			PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;68			PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker.clone()).into())?;69			Result::<(), sp_runtime::DispatchError>::Ok(())70		})?;71		let block_number = <frame_system::Pallet<T>>::current_block_number() + T::PendingInterval::get();72	}: {PromototionPallet::<T>::on_initialize(block_number)}7374	set_admin_address {75		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);76		let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());77	} : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))7879	payout_stakers{80		let b in 1..100;8182		let pallet_admin = account::<T::AccountId>("admin", 1, SEED);83		let share = Perbill::from_rational(1u32, 20);84		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;85		<T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());86		<T as Config>::Currency::make_free_balance_be(&<T as pallet::Config>::TreasuryAccountId::get(),  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());8788		let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();89		stakers.iter().for_each(|staker| {90			<T as Config>::Currency::make_free_balance_be(&staker,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());91		});92		(1..11).try_for_each(|i| {93			<frame_system::Pallet<T>>::set_block_number(i.into());94			T::RelayBlockNumberProvider::set_block_number((2*i).into());95			assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());96			assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());97			stakers.iter()98			.map(|staker| {99				PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())100			}).collect::<Result<Vec<_>, _>>()?;101102			Result::<(), sp_runtime::DispatchError>::Ok(())103		})?;104105		let stakes = Staked::<T>::iter_prefix((&stakers[0],)).into_iter().collect::<Vec<_>>();106		assert_eq!(stakes.len(), 10);107108		<frame_system::Pallet<T>>::set_block_number(15_000.into());109		T::RelayBlockNumberProvider::set_block_number(30_000.into());110	} : _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8))111112	stake {113		let caller = account::<T::AccountId>("caller", 0, SEED);114		let share = Perbill::from_rational(1u32, 10);115		let _ = <T as Config>::Currency::make_free_balance_be(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());116	} : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))117118	unstake_all {119		let caller = account::<T::AccountId>("caller", 0, SEED);120		let share = Perbill::from_rational(1u32, 20);121		let _ = <T as Config>::Currency::make_free_balance_be(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());122		(1..11).map(|i| {123			// used to change block number124			<frame_system::Pallet<T>>::set_block_number(i.into());125			T::RelayBlockNumberProvider::set_block_number((2*i).into());126			assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());127			assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());128			PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), share * <T as Config>::Currency::total_balance(&caller))129		}).collect::<Result<Vec<_>, _>>()?;130131	} : _(RawOrigin::Signed(caller.clone()))132133	unstake_partial {134		let caller = account::<T::AccountId>("caller", 0, SEED);135		let share = Perbill::from_rational(1u32, 20);136		let _ = <T as Config>::Currency::make_free_balance_be(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());137		(1..11).map(|i| {138			// used to change block number139			<frame_system::Pallet<T>>::set_block_number(i.into());140			T::RelayBlockNumberProvider::set_block_number((2*i).into());141			assert_eq!(<frame_system::Pallet<T>>::block_number(), i.into());142			assert_eq!(T::RelayBlockNumberProvider::current_block_number(), (2*i).into());143			PromototionPallet::<T>::stake(RawOrigin::Signed(caller.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())144		}).collect::<Result<Vec<_>, _>>()?;145146	} : _(RawOrigin::Signed(caller.clone()), Into::<BalanceOf<T>>::into(1000u128) * T::Nominal::get())147148	sponsor_collection {149		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);150		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;151		let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());152		let caller: T::AccountId = account("caller", 0, SEED);153		let _ = <T as Config>::Currency::make_free_balance_be(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());154		let collection = create_nft_collection::<T>(caller.clone())?;155	} : _(RawOrigin::Signed(pallet_admin.clone()), collection)156157	stop_sponsoring_collection {158		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);159		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;160		let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());161		let caller: T::AccountId = account("caller", 0, SEED);162		let _ = <T as Config>::Currency::make_free_balance_be(&caller,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());163		let collection = create_nft_collection::<T>(caller.clone())?;164		PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;165	} : _(RawOrigin::Signed(pallet_admin.clone()), collection)166167	sponsor_contract {168		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);169		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;170171		let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());172		let address = H160::from_low_u64_be(SEED as u64);173		let data: Vec<u8> = (0..20 as u8).collect();174		<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;175		<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;176	} : _(RawOrigin::Signed(pallet_admin.clone()), address)177178	stop_sponsoring_contract {179		let pallet_admin = account::<T::AccountId>("admin", 0, SEED);180		PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;181182		let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin,  Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());183		let address = H160::from_low_u64_be(SEED as u64);184		let data: Vec<u8> = (0..20 as u8).collect();185		<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;186		<EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;187		PromototionPallet::<T>::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?;188	} : _(RawOrigin::Signed(pallet_admin.clone()), address)189}
modifiedpallets/configuration/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/configuration/src/benchmarking.rs
+++ b/pallets/configuration/src/benchmarking.rs
@@ -68,7 +68,7 @@
 	}
 
 	set_collator_selection_license_bond {
-		let bond_cost: Option<BalanceOf<T>> = Some(T::Balances::minimum_balance() * 10u32.into());
+		let bond_cost: Option<BalanceOf<T>> = Some(T::Currency::minimum_balance() * 10u32.into());
 	}: {
 		assert_ok!(
 			<Pallet<T>>::set_collator_selection_license_bond(RawOrigin::Root.into(), bond_cost.clone())
modifiedpallets/inflation/src/lib.rsdiffbeforeafterboth
--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -39,18 +39,22 @@
 
 use frame_support::{
 	dispatch::{DispatchResult},
-	traits::{Currency, Get},
+	traits::{
+		fungible::{Balanced, Inspect, Mutate},
+		Get, Imbalance,
+		tokens::Precision,
+	},
 };
 pub use pallet::*;
 use sp_runtime::{
 	Perbill,
-	traits::{BlockNumberProvider},
+	traits::{BlockNumberProvider, Zero},
 };
 
 use sp_std::convert::TryInto;
 
 type BalanceOf<T> =
-	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+	<<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
 
 pub const YEAR: u32 = 5_259_600; // 6-second block
 								 // pub const YEAR: u32 = 2_629_800; // 12-second block
@@ -66,7 +70,9 @@
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Currency: Currency<Self::AccountId>;
+		type Currency: Balanced<Self::AccountId>
+			+ Inspect<Self::AccountId>
+			+ Mutate<Self::AccountId>;
 		type TreasuryAccountId: Get<Self::AccountId>;
 
 		// The block number provider
@@ -133,11 +139,8 @@
 					add_weight(0, 4, Weight::from_parts(5_000_000, 0));
 				}
 
-				T::Currency::deposit_into_existing(
-					&T::TreasuryAccountId::get(),
-					<BlockInflation<T>>::get(),
-				)
-				.ok();
+				T::Currency::mint_into(&T::TreasuryAccountId::get(), <BlockInflation<T>>::get())
+					.ok();
 
 				// Update inflation block
 				<NextInflationBlock<T>>::set(next_inflation + block_interval.into());
@@ -184,10 +187,12 @@
 				<NextInflationBlock<T>>::set(inflation_start_relay_block + block_interval.into());
 
 				// First time deposit - create Treasury account so that we can call deposit_into_existing everywhere else
-				T::Currency::deposit_creating(
+				let imbalance = T::Currency::deposit(
 					&T::TreasuryAccountId::get(),
 					<BlockInflation<T>>::get(),
-				);
+					Precision::Exact,
+				)?;
+				debug_assert!(imbalance.peek().is_zero());
 			}
 
 			Ok(())
modifiedpallets/structure/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -17,7 +17,7 @@
 use super::*;
 
 use frame_benchmarking::{benchmarks, account};
-use frame_support::traits::{Currency, Get};
+use frame_support::traits::{fungible::Balanced, Get, tokens::Precision};
 use up_data_structs::{
 	CreateCollectionData, CollectionMode, CreateItemData, CollectionFlags, CreateNftData,
 	budget::Unlimited,
@@ -32,7 +32,7 @@
 		let caller: T::AccountId = account("caller", 0, SEED);
 		let caller_cross = T::CrossAccountId::from_sub(caller.clone());
 
-		<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+		let _ = <T as CommonConfig>::Currency::deposit(&caller, T::CollectionCreationPrice::get(), Precision::Exact).unwrap();
 		T::CollectionDispatch::create(
 			caller_cross.clone(),
 			caller_cross.clone(),
modifiedpallets/unique/src/benchmarking.rsdiffbeforeafterboth
--- a/pallets/unique/src/benchmarking.rs
+++ b/pallets/unique/src/benchmarking.rs
@@ -19,7 +19,7 @@
 use super::*;
 use crate::Pallet;
 use frame_system::RawOrigin;
-use frame_support::traits::{tokens::currency::Currency, Get};
+use frame_support::traits::{fungible::Balanced, Get, tokens::Precision};
 use frame_benchmarking::{benchmarks, account};
 use sp_runtime::DispatchError;
 use pallet_common::{
@@ -38,7 +38,12 @@
 	owner: T::AccountId,
 	mode: CollectionMode,
 ) -> Result<CollectionId, DispatchError> {
-	<T as CommonConfig>::Currency::deposit_creating(&owner, T::CollectionCreationPrice::get());
+	let _ = <T as CommonConfig>::Currency::deposit(
+		&owner,
+		T::CollectionCreationPrice::get(),
+		Precision::Exact,
+	)
+	.unwrap();
 	let col_name = create_u16_data::<{ MAX_COLLECTION_NAME_LENGTH }>();
 	let col_desc = create_u16_data::<{ MAX_COLLECTION_DESCRIPTION_LENGTH }>();
 	let token_prefix = create_data::<{ MAX_TOKEN_PREFIX_LENGTH }>();
@@ -64,7 +69,7 @@
 		let token_prefix = create_data::<{MAX_TOKEN_PREFIX_LENGTH}>();
 		let mode: CollectionMode = CollectionMode::NFT;
 		let caller: T::AccountId = account("caller", 0, SEED);
-		<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
+		let _ = <T as CommonConfig>::Currency::deposit(&caller, T::CollectionCreationPrice::get(), Precision::Exact).unwrap();
 	}: _(RawOrigin::Signed(caller.clone()), col_name.clone(), col_desc.clone(), token_prefix.clone(), mode)
 	verify {
 		assert_eq!(<pallet_common::CollectionById<T>>::get(CollectionId(1)).unwrap().owner, caller);