Make pallet Assets instantiable (#8483)

* Make pallet Assets instantiable

* use instantiable benchmarks

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Daniel Olano
2021-04-16 10:51:26 +02:00
committed by GitHub
parent 6bcf5f21c4
commit 7527bd758c
7 changed files with 331 additions and 284 deletions
+88 -88
View File
@@ -24,7 +24,7 @@ use super::*;
use sp_runtime::traits::Bounded;
use frame_system::RawOrigin as SystemOrigin;
use frame_benchmarking::{
benchmarks, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
benchmarks_instance_pallet, account, whitelisted_caller, whitelist_account, impl_benchmark_test_suite
};
use frame_support::traits::Get;
use frame_support::{traits::EnsureOrigin, dispatch::UnfilteredDispatchable};
@@ -33,13 +33,13 @@ use crate::Pallet as Assets;
const SEED: u32 = 0;
fn create_default_asset<T: Config>(is_sufficient: bool)
fn create_default_asset<T: Config<I>, I: 'static>(is_sufficient: bool)
-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
{
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
let root = SystemOrigin::Root.into();
assert!(Assets::<T>::force_create(
assert!(Assets::<T, I>::force_create(
root,
Default::default(),
caller_lookup.clone(),
@@ -49,14 +49,14 @@ fn create_default_asset<T: Config>(is_sufficient: bool)
(caller, caller_lookup)
}
fn create_default_minted_asset<T: Config>(is_sufficient: bool, amount: T::Balance)
fn create_default_minted_asset<T: Config<I>, I: 'static>(is_sufficient: bool, amount: T::Balance)
-> (T::AccountId, <T::Lookup as StaticLookup>::Source)
{
let (caller, caller_lookup) = create_default_asset::<T>(is_sufficient);
let (caller, caller_lookup) = create_default_asset::<T, I>(is_sufficient);
if !is_sufficient {
T::Currency::make_free_balance_be(&caller, T::Currency::minimum_balance());
}
assert!(Assets::<T>::mint(
assert!(Assets::<T, I>::mint(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
caller_lookup.clone(),
@@ -65,42 +65,42 @@ fn create_default_minted_asset<T: Config>(is_sufficient: bool, amount: T::Balanc
(caller, caller_lookup)
}
fn swap_is_sufficient<T: Config>(s: &mut bool) {
Asset::<T>::mutate(&T::AssetId::default(), |maybe_a|
fn swap_is_sufficient<T: Config<I>, I: 'static>(s: &mut bool) {
Asset::<T, I>::mutate(&T::AssetId::default(), |maybe_a|
if let Some(ref mut a) = maybe_a { sp_std::mem::swap(s, &mut a.is_sufficient) }
);
}
fn add_consumers<T: Config>(minter: T::AccountId, n: u32) {
fn add_consumers<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
let origin = SystemOrigin::Signed(minter);
let mut s = false;
swap_is_sufficient::<T>(&mut s);
swap_is_sufficient::<T, I>(&mut s);
for i in 0..n {
let target = account("consumer", i, SEED);
T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
let target_lookup = T::Lookup::unlookup(target);
assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
}
swap_is_sufficient::<T>(&mut s);
swap_is_sufficient::<T, I>(&mut s);
}
fn add_sufficients<T: Config>(minter: T::AccountId, n: u32) {
fn add_sufficients<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
let origin = SystemOrigin::Signed(minter);
let mut s = true;
swap_is_sufficient::<T>(&mut s);
swap_is_sufficient::<T, I>(&mut s);
for i in 0..n {
let target = account("sufficient", i, SEED);
let target_lookup = T::Lookup::unlookup(target);
assert!(Assets::<T>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
assert!(Assets::<T, I>::mint(origin.clone().into(), Default::default(), target_lookup, 100u32.into()).is_ok());
}
swap_is_sufficient::<T>(&mut s);
swap_is_sufficient::<T, I>(&mut s);
}
fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
fn add_approvals<T: Config<I>, I: 'static>(minter: T::AccountId, n: u32) {
T::Currency::deposit_creating(&minter, T::ApprovalDeposit::get() * n.into());
let minter_lookup = T::Lookup::unlookup(minter.clone());
let origin = SystemOrigin::Signed(minter);
Assets::<T>::mint(
Assets::<T, I>::mint(
origin.clone().into(),
Default::default(),
minter_lookup,
@@ -110,7 +110,7 @@ fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
let target = account("approval", i, SEED);
T::Currency::make_free_balance_be(&target, T::Currency::minimum_balance());
let target_lookup = T::Lookup::unlookup(target);
Assets::<T>::approve_transfer(
Assets::<T, I>::approve_transfer(
origin.clone().into(),
Default::default(),
target_lookup,
@@ -119,7 +119,7 @@ fn add_approvals<T: Config>(minter: T::AccountId, n: u32) {
}
}
fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
let events = frame_system::Pallet::<T>::events();
let system_event: <T as frame_system::Config>::Event = generic_event.into();
// compare to the last event record
@@ -127,7 +127,7 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
assert_eq!(event, &system_event);
}
fn assert_event<T: Config>(generic_event: <T as Config>::Event) {
fn assert_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::Event) {
let system_event: <T as frame_system::Config>::Event = generic_event.into();
let events = frame_system::Pallet::<T>::events();
assert!(events.iter().any(|event_record| {
@@ -135,14 +135,14 @@ fn assert_event<T: Config>(generic_event: <T as Config>::Event) {
}));
}
benchmarks! {
benchmarks_instance_pallet! {
create {
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1u32.into())
verify {
assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
assert_last_event::<T, I>(Event::Created(Default::default(), caller.clone(), caller).into());
}
force_create {
@@ -150,127 +150,127 @@ benchmarks! {
let caller_lookup = T::Lookup::unlookup(caller.clone());
}: _(SystemOrigin::Root, Default::default(), caller_lookup, true, 1u32.into())
verify {
assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
assert_last_event::<T, I>(Event::ForceCreated(Default::default(), caller).into());
}
destroy {
let c in 0 .. 5_000;
let s in 0 .. 5_000;
let a in 0 .. 5_00;
let (caller, _) = create_default_asset::<T>(true);
add_consumers::<T>(caller.clone(), c);
add_sufficients::<T>(caller.clone(), s);
add_approvals::<T>(caller.clone(), a);
let witness = Asset::<T>::get(T::AssetId::default()).unwrap().destroy_witness();
let (caller, _) = create_default_asset::<T, I>(true);
add_consumers::<T, I>(caller.clone(), c);
add_sufficients::<T, I>(caller.clone(), s);
add_approvals::<T, I>(caller.clone(), a);
let witness = Asset::<T, I>::get(T::AssetId::default()).unwrap().destroy_witness();
}: _(SystemOrigin::Signed(caller), Default::default(), witness)
verify {
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
assert_last_event::<T, I>(Event::Destroyed(Default::default()).into());
}
mint {
let (caller, caller_lookup) = create_default_asset::<T>(true);
let (caller, caller_lookup) = create_default_asset::<T, I>(true);
let amount = T::Balance::from(100u32);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
assert_last_event::<T, I>(Event::Issued(Default::default(), caller, amount).into());
}
burn {
let amount = T::Balance::from(100u32);
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
assert_last_event::<T, I>(Event::Burned(Default::default(), caller, amount).into());
}
transfer {
let amount = T::Balance::from(100u32);
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
}
transfer_keep_alive {
let mint_amount = T::Balance::from(200u32);
let amount = T::Balance::from(100u32);
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, mint_amount);
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, mint_amount);
let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert!(frame_system::Pallet::<T>::account_exists(&caller));
assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
}
force_transfer {
let amount = T::Balance::from(100u32);
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, amount);
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
verify {
assert_last_event::<T>(
assert_last_event::<T, I>(
Event::Transferred(Default::default(), caller, target, amount).into()
);
}
freeze {
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
assert_last_event::<T, I>(Event::Frozen(Default::default(), caller).into());
}
thaw {
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
Assets::<T>::freeze(
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
Assets::<T, I>::freeze(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
caller_lookup.clone(),
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
assert_last_event::<T, I>(Event::Thawed(Default::default(), caller).into());
}
freeze_asset {
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
assert_last_event::<T, I>(Event::AssetFrozen(Default::default()).into());
}
thaw_asset {
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
Assets::<T>::freeze_asset(
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
Assets::<T, I>::freeze_asset(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
assert_last_event::<T, I>(Event::AssetThawed(Default::default()).into());
}
transfer_ownership {
let (caller, _) = create_default_asset::<T>(true);
let (caller, _) = create_default_asset::<T, I>(true);
let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
verify {
assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
assert_last_event::<T, I>(Event::OwnerChanged(Default::default(), target).into());
}
set_team {
let (caller, _) = create_default_asset::<T>(true);
let (caller, _) = create_default_asset::<T, I>(true);
let target0 = T::Lookup::unlookup(account("target", 0, SEED));
let target1 = T::Lookup::unlookup(account("target", 1, SEED));
let target2 = T::Lookup::unlookup(account("target", 2, SEED));
}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
verify {
assert_last_event::<T>(Event::TeamChanged(
assert_last_event::<T, I>(Event::TeamChanged(
Default::default(),
account("target", 0, SEED),
account("target", 1, SEED),
@@ -286,23 +286,23 @@ benchmarks! {
let symbol = vec![0u8; s as usize];
let decimals = 12;
let (caller, _) = create_default_asset::<T>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, _) = create_default_asset::<T, I>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
verify {
let id = Default::default();
assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
}
clear_metadata {
let (caller, _) = create_default_asset::<T>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, _) = create_default_asset::<T, I>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
let dummy = vec![0u8; T::StringLimit::get() as usize];
let origin = SystemOrigin::Signed(caller.clone()).into();
Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
}: _(SystemOrigin::Signed(caller), Default::default())
verify {
assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
}
force_set_metadata {
@@ -313,10 +313,10 @@ benchmarks! {
let symbol = vec![0u8; s as usize];
let decimals = 12;
create_default_asset::<T>(true);
create_default_asset::<T, I>(true);
let origin = T::ForceOrigin::successful_origin();
let call = Call::<T>::force_set_metadata(
let call = Call::<T, I>::force_set_metadata(
Default::default(),
name.clone(),
symbol.clone(),
@@ -326,28 +326,28 @@ benchmarks! {
}: { call.dispatch_bypass_filter(origin)? }
verify {
let id = Default::default();
assert_last_event::<T>(Event::MetadataSet(id, name, symbol, decimals, false).into());
assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
}
force_clear_metadata {
let (caller, _) = create_default_asset::<T>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, _) = create_default_asset::<T, I>(true);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
let dummy = vec![0u8; T::StringLimit::get() as usize];
let origin = SystemOrigin::Signed(caller.clone()).into();
Assets::<T>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
let origin = T::ForceOrigin::successful_origin();
let call = Call::<T>::force_clear_metadata(Default::default());
let call = Call::<T, I>::force_clear_metadata(Default::default());
}: { call.dispatch_bypass_filter(origin)? }
verify {
assert_last_event::<T>(Event::MetadataCleared(Default::default()).into());
assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
}
force_asset_status {
let (caller, caller_lookup) = create_default_asset::<T>(true);
let (caller, caller_lookup) = create_default_asset::<T, I>(true);
let origin = T::ForceOrigin::successful_origin();
let call = Call::<T>::force_asset_status(
let call = Call::<T, I>::force_asset_status(
Default::default(),
caller_lookup.clone(),
caller_lookup.clone(),
@@ -359,12 +359,12 @@ benchmarks! {
);
}: { call.dispatch_bypass_filter(origin)? }
verify {
assert_last_event::<T>(Event::AssetStatusChanged(Default::default()).into());
assert_last_event::<T, I>(Event::AssetStatusChanged(Default::default()).into());
}
approve_transfer {
let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, _) = create_default_minted_asset::<T, I>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
let id = Default::default();
let delegate: T::AccountId = account("delegate", 0, SEED);
@@ -372,12 +372,12 @@ benchmarks! {
let amount = 100u32.into();
}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup, amount)
verify {
assert_last_event::<T>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
assert_last_event::<T, I>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
}
transfer_approved {
let (owner, owner_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
T::Currency::make_free_balance_be(&owner, DepositBalanceOf::<T>::max_value());
let (owner, owner_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
T::Currency::make_free_balance_be(&owner, DepositBalanceOf::<T, I>::max_value());
let id = Default::default();
let delegate: T::AccountId = account("delegate", 0, SEED);
@@ -385,44 +385,44 @@ benchmarks! {
let delegate_lookup = T::Lookup::unlookup(delegate.clone());
let amount = 100u32.into();
let origin = SystemOrigin::Signed(owner.clone()).into();
Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
let dest: T::AccountId = account("dest", 0, SEED);
let dest_lookup = T::Lookup::unlookup(dest.clone());
}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
verify {
assert!(T::Currency::reserved_balance(&owner).is_zero());
assert_event::<T>(Event::Transferred(id, owner, dest, amount).into());
assert_event::<T, I>(Event::Transferred(id, owner, dest, amount).into());
}
cancel_approval {
let (caller, _) = create_default_minted_asset::<T>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, _) = create_default_minted_asset::<T, I>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
let id = Default::default();
let delegate: T::AccountId = account("delegate", 0, SEED);
let delegate_lookup = T::Lookup::unlookup(delegate.clone());
let amount = 100u32.into();
let origin = SystemOrigin::Signed(caller.clone()).into();
Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup)
verify {
assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
}
force_cancel_approval {
let (caller, caller_lookup) = create_default_minted_asset::<T>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T>::max_value());
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, 100u32.into());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
let id = Default::default();
let delegate: T::AccountId = account("delegate", 0, SEED);
let delegate_lookup = T::Lookup::unlookup(delegate.clone());
let amount = 100u32.into();
let origin = SystemOrigin::Signed(caller.clone()).into();
Assets::<T>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
}: _(SystemOrigin::Signed(caller.clone()), id, caller_lookup, delegate_lookup)
verify {
assert_last_event::<T>(Event::ApprovalCancelled(id, caller, delegate).into());
assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
}
}