Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Migrate assets pallet to new macros #7984

Merged
12 commits merged into from
Feb 4, 2021
Merged

Migrate assets pallet to new macros #7984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8f48a9b
Prep: move things around to suggested order
dvdplm Jan 21, 2021
d1131c5
Merge remote-tracking branch 'origin/master' into dp-migrate-pallet-a…
dvdplm Jan 26, 2021
fa0ffa0
Compiles, tests pass
dvdplm Jan 26, 2021
01ad2fe
cleanup
dvdplm Jan 26, 2021
0fcbf76
cleanup 2
dvdplm Jan 26, 2021
a78a7cf
Fix dead doc-links
dvdplm Jan 26, 2021
21be832
Add back documentation for storage items
dvdplm Jan 26, 2021
c8b8d83
Switch benchmarks to use `Event` rather than `RawEvent`.
dvdplm Feb 1, 2021
10adddf
Update frame/assets/src/lib.rs
dvdplm Feb 4, 2021
2c53149
Merge remote-tracking branch 'origin/master' into dp-migrate-pallet-a…
dvdplm Feb 4, 2021
1154bdf
reviwe feedback
dvdplm Feb 4, 2021
4a67c91
Obey line length checks
dvdplm Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions frame/assets/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use super::*;
use sp_runtime::traits::Bounded;
use frame_system::RawOrigin as SystemOrigin;
use frame_benchmarking::{benchmarks, account, whitelisted_caller};
use frame_support::traits::Get;

use crate::Module as Assets;

Expand Down Expand Up @@ -79,15 +80,15 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
verify {
assert_last_event::<T>(RawEvent::Created(Default::default(), caller.clone(), caller).into());
assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
}

force_create {
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
verify {
assert_last_event::<T>(RawEvent::ForceCreated(Default::default(), caller).into());
assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
}

destroy {
Expand All @@ -96,7 +97,7 @@ benchmarks! {
add_zombies::<T>(caller.clone(), z);
}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
verify {
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
}

force_destroy {
Expand All @@ -105,23 +106,23 @@ benchmarks! {
add_zombies::<T>(caller.clone(), z);
}: _(SystemOrigin::Root, Default::default(), 10_000)
verify {
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
}

mint {
let (caller, caller_lookup) = create_default_asset::<T>(10);
let amount = T::Balance::from(100u32);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Issued(Default::default(), caller, amount).into());
assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
}

burn {
let amount = T::Balance::from(100u32);
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Burned(Default::default(), caller, amount).into());
assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
}

transfer {
Expand All @@ -131,7 +132,7 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
}

force_transfer {
Expand All @@ -141,14 +142,16 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::ForceTransferred(Default::default(), caller, target, amount).into());
assert_last_event::<T>(
Event::ForceTransferred(Default::default(), caller, target, amount).into()
);
}

freeze {
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(RawEvent::Frozen(Default::default(), caller).into());
assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
}

thaw {
Expand All @@ -160,14 +163,14 @@ benchmarks! {
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
}

freeze_asset {
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(RawEvent::AssetFrozen(Default::default()).into());
assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
}

thaw_asset {
Expand All @@ -178,7 +181,7 @@ benchmarks! {
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(RawEvent::AssetThawed(Default::default()).into());
assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
}

transfer_ownership {
Expand All @@ -187,7 +190,7 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
verify {
assert_last_event::<T>(RawEvent::OwnerChanged(Default::default(), target).into());
assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
}

set_team {
Expand All @@ -197,7 +200,7 @@ benchmarks! {
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>(RawEvent::TeamChanged(
assert_last_event::<T>(Event::TeamChanged(
Default::default(),
account("target", 0, SEED),
account("target", 1, SEED),
Expand All @@ -211,7 +214,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
verify {
assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
assert_last_event::<T>(Event::MaxZombiesChanged(Default::default(), max_zombies).into());
}

set_metadata {
Expand All @@ -226,7 +229,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
verify {
assert_last_event::<T>(RawEvent::MetadataSet(Default::default(), name, symbol, decimals).into());
assert_last_event::<T>(Event::MetadataSet(Default::default(), name, symbol, decimals).into());
}
}

Expand Down
Loading