difftreelog
feat switch `inflation` from `Currency` trait to `fungible::*` traits fix: benchmarks
in: master
5 files changed
pallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth33where33where34 T: Config + pallet_unique::Config + pallet_evm_migration::Config,34 T: Config + pallet_unique::Config + pallet_evm_migration::Config,35 T::BlockNumber: From<u32> + Into<u32>,35 T::BlockNumber: From<u32> + Into<u32>,36 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,36 BalanceOf<T>: Sum + From<u128>,37{37{38 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);38 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);393940 <T as Config>::Currency::make_free_balance_be(40 <T as Config>::Currency::set_balance(41 &pallet_admin,41 &pallet_admin,42 Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),42 Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value(),43 );43 );54 where_clause{54 where_clause{55 where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,55 where T: Config + pallet_unique::Config + pallet_evm_migration::Config ,56 T::BlockNumber: From<u32> + Into<u32>,56 T::BlockNumber: From<u32> + Into<u32>,57 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>57 BalanceOf<T>: Sum + From<u128>58 }58 }595960 on_initialize {60 on_initialize {636364 (0..b).try_for_each(|index| {64 (0..b).try_for_each(|index| {65 let staker = account::<T::AccountId>("staker", index, SEED);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());66 <T as Config>::Currency::set_balance(&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())?;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())?;68 PromototionPallet::<T>::unstake_all(RawOrigin::Signed(staker.clone()).into())?;69 Result::<(), sp_runtime::DispatchError>::Ok(())69 Result::<(), sp_runtime::DispatchError>::Ok(())737374 set_admin_address {74 set_admin_address {75 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);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());76 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());77 } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))77 } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin))787879 payout_stakers{79 payout_stakers{82 let pallet_admin = account::<T::AccountId>("admin", 1, SEED);82 let pallet_admin = account::<T::AccountId>("admin", 1, SEED);83 let share = Perbill::from_rational(1u32, 20);83 let share = Perbill::from_rational(1u32, 20);84 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;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());85 <T as Config>::Currency::set_balance(&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());86 <T as Config>::Currency::set_balance(&<T as pallet::Config>::TreasuryAccountId::get(), Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());878788 let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();88 let stakers: Vec<T::AccountId> = (0..b).map(|index| account("staker", index, SEED)).collect();89 stakers.iter().for_each(|staker| {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());90 <T as Config>::Currency::set_balance(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());91 });91 });92 (1..11).try_for_each(|i| {92 (1..11).try_for_each(|i| {93 <frame_system::Pallet<T>>::set_block_number(i.into());93 <frame_system::Pallet<T>>::set_block_number(i.into());112 stake {112 stake {113 let caller = account::<T::AccountId>("caller", 0, SEED);113 let caller = account::<T::AccountId>("caller", 0, SEED);114 let share = Perbill::from_rational(1u32, 10);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());115 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());116 } : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))116 } : _(RawOrigin::Signed(caller.clone()), share * <T as Config>::Currency::total_balance(&caller))117117118 unstake_all {118 unstake_all {119 let caller = account::<T::AccountId>("caller", 0, SEED);119 let caller = account::<T::AccountId>("caller", 0, SEED);120 let share = Perbill::from_rational(1u32, 20);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());121 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());122 (1..11).map(|i| {122 (1..11).map(|i| {123 // used to change block number123 // used to change block number124 <frame_system::Pallet<T>>::set_block_number(i.into());124 <frame_system::Pallet<T>>::set_block_number(i.into());133 unstake_partial {133 unstake_partial {134 let caller = account::<T::AccountId>("caller", 0, SEED);134 let caller = account::<T::AccountId>("caller", 0, SEED);135 let share = Perbill::from_rational(1u32, 20);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());136 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());137 (1..11).map(|i| {137 (1..11).map(|i| {138 // used to change block number138 // used to change block number139 <frame_system::Pallet<T>>::set_block_number(i.into());139 <frame_system::Pallet<T>>::set_block_number(i.into());148 sponsor_collection {148 sponsor_collection {149 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);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()))?;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());151 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());152 let caller: T::AccountId = account("caller", 0, SEED);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());153 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());154 let collection = create_nft_collection::<T>(caller.clone())?;154 let collection = create_nft_collection::<T>(caller.clone())?;155 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)155 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)156156157 stop_sponsoring_collection {157 stop_sponsoring_collection {158 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);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()))?;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());160 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());161 let caller: T::AccountId = account("caller", 0, SEED);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());162 let _ = <T as Config>::Currency::set_balance(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());163 let collection = create_nft_collection::<T>(caller.clone())?;163 let collection = create_nft_collection::<T>(caller.clone())?;164 PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;164 PromototionPallet::<T>::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?;165 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)165 } : _(RawOrigin::Signed(pallet_admin.clone()), collection)168 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);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()))?;169 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;170170171 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());171 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());172 let address = H160::from_low_u64_be(SEED as u64);172 let address = H160::from_low_u64_be(SEED as u64);173 let data: Vec<u8> = (0..20 as u8).collect();173 let data: Vec<u8> = (0..20 as u8).collect();174 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;174 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;179 let pallet_admin = account::<T::AccountId>("admin", 0, SEED);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()))?;180 PromototionPallet::<T>::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?;181181182 let _ = <T as Config>::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());182 let _ = <T as Config>::Currency::set_balance(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::<T>::max_value());183 let address = H160::from_low_u64_be(SEED as u64);183 let address = H160::from_low_u64_be(SEED as u64);184 let data: Vec<u8> = (0..20 as u8).collect();184 let data: Vec<u8> = (0..20 as u8).collect();185 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;185 <EvmMigrationPallet<T>>::begin(RawOrigin::Root.into(), address)?;pallets/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())
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);