difftreelog
feat switch `inflation` from `Currency` trait to `fungible::*` traits fix: benchmarks
in: master
5 files changed
pallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -33,11 +33,11 @@
where
T: Config + pallet_unique::Config + pallet_evm_migration::Config,
T::BlockNumber: From<u32> + Into<u32>,
- <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,
+ BalanceOf<T>: Sum + From<u128>,
{
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
- <T as Config>::Currency::make_free_balance_be(
+ <T as Config>::Currency::set_balance(
&pallet_admin,
Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),
);
@@ -54,7 +54,7 @@
where_clause{
where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,
T::BlockNumber: From<u32> + Into<u32>,
- <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>
+ BalanceOf<T>: Sum + From<u128>
}
on_initialize {
@@ -63,7 +63,7 @@
(0..b).try_for_each(|index| {
let staker = account::<T::AccountId>("staker", index, SEED);
- <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ <T as Config>::Currency::set_balance(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
PromototionPallet::<T>::stake(RawOrigin::Signed(staker.clone()).into(), Into::<BalanceOf<T>>::into(100u128) * T::Nominal::get())?;
PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker.clone()).into())?;
Result::<(), sp_runtime::DispatchError>::Ok(())
@@ -73,7 +73,7 @@
set_admin_address {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
- let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
} : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))
payout_stakers{
@@ -82,12 +82,12 @@
let pallet_admin = account::<T::AccountId>("admin", 1, SEED);
let share = Perbill::from_rational(1u32, 20);
PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
- <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
- <T as Config>::Currency::make_free_balance_be(&<T as pallet::Config>::TreasuryAccountId::get(), Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ <T as Config>::Currency::set_balance(&<T as pallet::Config>::TreasuryAccountId::get(), Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();
stakers.iter().for_each(|staker| {
- <T as Config>::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ <T as Config>::Currency::set_balance(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
});
(1..11).try_for_each(|i| {
<frame_system::Pallet<T>>::set_block_number(i.into());
@@ -112,13 +112,13 @@
stake {
let caller = account::<T::AccountId>("caller", 0, SEED);
let share = Perbill::from_rational(1u32, 10);
- let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
} : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))
unstake_all {
let caller = account::<T::AccountId>("caller", 0, SEED);
let share = Perbill::from_rational(1u32, 20);
- let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
(1..11).map(|i| {
// used to change block number
<frame_system::Pallet<T>>::set_block_number(i.into());
@@ -133,7 +133,7 @@
unstake_partial {
let caller = account::<T::AccountId>("caller", 0, SEED);
let share = Perbill::from_rational(1u32, 20);
- let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
(1..11).map(|i| {
// used to change block number
<frame_system::Pallet<T>>::set_block_number(i.into());
@@ -148,18 +148,18 @@
sponsor_collection {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
- let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let caller: T::AccountId = account("caller", 0, SEED);
- let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let collection = create_nft_collection::<T>(caller.clone())?;
} : _(RawOrigin::Signed(pallet_admin.clone()), collection)
stop_sponsoring_collection {
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
- let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let caller: T::AccountId = account("caller", 0, SEED);
- let _ = <T as Config>::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let collection = create_nft_collection::<T>(caller.clone())?;
PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;
} : _(RawOrigin::Signed(pallet_admin.clone()), collection)
@@ -168,7 +168,7 @@
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
- let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let address = H160::from_low_u64_be(SEED as u64);
let data: Vec<u8> = (0..20 as u8).collect();
<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
@@ -179,7 +179,7 @@
let pallet_admin = account::<T::AccountId>("admin", 0, SEED);
PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;
- let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
+ let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());
let address = H160::from_low_u64_be(SEED as u64);
let data: Vec<u8> = (0..20 as u8).collect();
<EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;
pallets/configuration/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/>.1617//! Benchmarking setup for pallet-configuration1819use super::*;20use frame_benchmarking::benchmarks;21use frame_system::{EventRecord, RawOrigin};22use frame_support::{assert_ok, traits::fungible::Inspect};2324fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {25 let events = frame_system::Pallet::<T>::events();26 let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();27 // compare to the last event record28 let EventRecord { event, .. } = &events[events.len() - 1];29 assert_eq!(event, &system_event);30}3132benchmarks! {33 where_clause { where T: Config }3435 set_weight_to_fee_coefficient_override {36 let coeff: u64 = 999;37 }: {38 assert_ok!(39 <Pallet<T>>::set_weight_to_fee_coefficient_override(RawOrigin::Root.into(), Some(coeff))40 );41 }4243 set_min_gas_price_override {44 let coeff: u64 = 999;45 }: {46 assert_ok!(47 <Pallet<T>>::set_min_gas_price_override(RawOrigin::Root.into(), Some(coeff))48 );49 }5051 set_app_promotion_configuration_override {52 let configuration: AppPromotionConfiguration<T::BlockNumber> = Default::default();53 }: {54 assert_ok!(55 <Pallet<T>>::set_app_promotion_configuration_override(RawOrigin::Root.into(), configuration)56 );57 }5859 set_collator_selection_desired_collators {60 let max: u32 = 999;61 }: {62 assert_ok!(63 <Pallet<T>>::set_collator_selection_desired_collators(RawOrigin::Root.into(), Some(max.clone()))64 );65 }66 verify {67 assert_last_event::<T>(Event::NewDesiredCollators{desired_collators: Some(max)}.into());68 }6970 set_collator_selection_license_bond {71 let bond_cost: Option<BalanceOf<T>> = Some(T::Balances::minimum_balance() * 10u32.into());72 }: {73 assert_ok!(74 <Pallet<T>>::set_collator_selection_license_bond(RawOrigin::Root.into(), bond_cost.clone())75 );76 }77 verify {78 assert_last_event::<T>(Event::NewCollatorLicenseBond{bond_cost}.into());79 }8081 set_collator_selection_kick_threshold {82 let threshold: Option<T::BlockNumber> = Some(900u32.into());83 }: {84 assert_ok!(85 <Pallet<T>>::set_collator_selection_kick_threshold(RawOrigin::Root.into(), threshold.clone())86 );87 }88 verify {89 assert_last_event::<T>(Event::NewCollatorKickThreshold{length_in_blocks: threshold}.into());90 }91}pallets/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(())
pallets/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(),
pallets/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);