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

Add field names to pallet Event variants #9993

Merged
merged 20 commits into from
Nov 16, 2021
Merged

Add field names to pallet Event variants #9993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d32c5c2
convert pallet-assets events to struct types
Wizdave97 Oct 6, 2021
d9ec48f
updated events of a couple pallets
Wizdave97 Oct 9, 2021
39ad825
updated pallet event field names
Wizdave97 Oct 11, 2021
5572b6d
update pallet event field names
Wizdave97 Oct 11, 2021
98b3178
updated events in test files
Wizdave97 Oct 26, 2021
e1c8fa6
cargo fmt
Wizdave97 Oct 26, 2021
dbe4f5a
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Oct 29, 2021
8290edd
minorfixes
Wizdave97 Nov 1, 2021
6367485
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 1, 2021
1937c41
merge changes from master
Wizdave97 Nov 4, 2021
b34a471
fix assertion error
Wizdave97 Nov 5, 2021
cb1731d
minor fix
Wizdave97 Nov 5, 2021
474ded6
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 9, 2021
4ac4479
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 10, 2021
8189bed
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 11, 2021
0128a1d
formatting fix
Wizdave97 Nov 11, 2021
a98368c
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 11, 2021
510d053
fmt
Wizdave97 Nov 12, 2021
fd0b3b3
Merge branch 'master' of https://github.com/paritytech/substrate into…
Wizdave97 Nov 12, 2021
a44f50e
fix conflicts
Wizdave97 Nov 15, 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
69 changes: 39 additions & 30 deletions bin/node/executor/tests/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,24 +387,27 @@ fn full_native_block_import_works() {
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Withdraw(alice().into(), fees)),
event: Event::Balances(pallet_balances::Event::Withdraw {
who: alice().into(),
amount: fees,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Transfer(
alice().into(),
bob().into(),
69 * DOLLARS,
)),
event: Event::Balances(pallet_balances::Event::Transfer {
from: alice().into(),
to: bob().into(),
amount: 69 * DOLLARS,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Deposit(
pallet_treasury::Pallet::<Runtime>::account_id(),
fees * 8 / 10,
)),
event: Event::Balances(pallet_balances::Event::Deposit {
who: pallet_treasury::Pallet::<Runtime>::account_id(),
amount: fees * 8 / 10,
}),
topics: vec![],
},
EventRecord {
Expand Down Expand Up @@ -454,24 +457,27 @@ fn full_native_block_import_works() {
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Withdraw(bob().into(), fees)),
event: Event::Balances(pallet_balances::Event::Withdraw {
who: bob().into(),
amount: fees,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Transfer(
bob().into(),
alice().into(),
5 * DOLLARS,
)),
event: Event::Balances(pallet_balances::Event::Transfer {
from: bob().into(),
to: alice().into(),
amount: 5 * DOLLARS,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
event: Event::Balances(pallet_balances::Event::Deposit(
pallet_treasury::Pallet::<Runtime>::account_id(),
fees * 8 / 10,
)),
event: Event::Balances(pallet_balances::Event::Deposit {
who: pallet_treasury::Pallet::<Runtime>::account_id(),
amount: fees * 8 / 10,
}),
topics: vec![],
},
EventRecord {
Expand All @@ -489,24 +495,27 @@ fn full_native_block_import_works() {
},
EventRecord {
phase: Phase::ApplyExtrinsic(2),
event: Event::Balances(pallet_balances::Event::Withdraw(alice().into(), fees)),
event: Event::Balances(pallet_balances::Event::Withdraw {
who: alice().into(),
amount: fees,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(2),
event: Event::Balances(pallet_balances::Event::Transfer(
alice().into(),
bob().into(),
15 * DOLLARS,
)),
event: Event::Balances(pallet_balances::Event::Transfer {
from: alice().into(),
to: bob().into(),
amount: 15 * DOLLARS,
}),
topics: vec![],
},
EventRecord {
phase: Phase::ApplyExtrinsic(2),
event: Event::Balances(pallet_balances::Event::Deposit(
pallet_treasury::Pallet::<Runtime>::account_id(),
fees * 8 / 10,
)),
event: Event::Balances(pallet_balances::Event::Deposit {
who: pallet_treasury::Pallet::<Runtime>::account_id(),
amount: fees * 8 / 10,
}),
topics: vec![],
},
EventRecord {
Expand Down
56 changes: 28 additions & 28 deletions frame/assets/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ benchmarks_instance_pallet! {
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, I>(Event::Created(Default::default(), caller.clone(), caller).into());
assert_last_event::<T, I>(Event::Created { asset_id: Default::default(), creator: caller.clone(), owner: caller }.into());
}

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

destroy {
Expand All @@ -177,23 +177,23 @@ benchmarks_instance_pallet! {
let witness = Asset::<T, I>::get(T::AssetId::default()).unwrap().destroy_witness();
}: _(SystemOrigin::Signed(caller), Default::default(), witness)
verify {
assert_last_event::<T, I>(Event::Destroyed(Default::default()).into());
assert_last_event::<T, I>(Event::Destroyed { asset_id: Default::default() }.into());
}

mint {
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, I>(Event::Issued(Default::default(), caller, amount).into());
assert_last_event::<T, I>(Event::Issued { asset_id: Default::default(), owner: caller, total_supply: amount }.into());
}

burn {
let amount = T::Balance::from(100u32);
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, I>(Event::Burned(Default::default(), caller, amount).into());
assert_last_event::<T, I>(Event::Burned { asset_id: Default::default(), owner: caller, balance: amount }.into());
}

transfer {
Expand All @@ -203,7 +203,7 @@ benchmarks_instance_pallet! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T, I>(Event::Transferred { asset_id: Default::default(), from: caller, to: target, amount }.into());
}

transfer_keep_alive {
Expand All @@ -215,7 +215,7 @@ benchmarks_instance_pallet! {
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert!(frame_system::Pallet::<T>::account_exists(&caller));
assert_last_event::<T, I>(Event::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T, I>(Event::Transferred { asset_id: Default::default(), from: caller, to: target, amount }.into());
}

force_transfer {
Expand All @@ -226,15 +226,15 @@ benchmarks_instance_pallet! {
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
verify {
assert_last_event::<T, I>(
Event::Transferred(Default::default(), caller, target, amount).into()
Event::Transferred { asset_id: Default::default(), from: caller, to: target, amount }.into()
);
}

freeze {
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, I>(Event::Frozen(Default::default(), caller).into());
assert_last_event::<T, I>(Event::Frozen { asset_id: Default::default(), who: caller }.into());
}

thaw {
Expand All @@ -246,14 +246,14 @@ benchmarks_instance_pallet! {
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T, I>(Event::Thawed(Default::default(), caller).into());
assert_last_event::<T, I>(Event::Thawed { asset_id: Default::default(), who: caller }.into());
}

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

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

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

set_team {
Expand All @@ -283,12 +283,12 @@ benchmarks_instance_pallet! {
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, I>(Event::TeamChanged(
Default::default(),
account("target", 0, SEED),
account("target", 1, SEED),
account("target", 2, SEED),
).into());
assert_last_event::<T, I>(Event::TeamChanged {
asset_id: Default::default(),
issuer: account("target", 0, SEED),
admin: account("target", 1, SEED),
freezer: account("target", 2, SEED),
}.into());
}

set_metadata {
Expand All @@ -304,7 +304,7 @@ benchmarks_instance_pallet! {
}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
verify {
let id = Default::default();
assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
assert_last_event::<T, I>(Event::MetadataSet { asset_id: id, name, symbol, decimals, is_frozen: false }.into());
}

clear_metadata {
Expand All @@ -315,7 +315,7 @@ benchmarks_instance_pallet! {
Assets::<T, I>::set_metadata(origin, Default::default(), dummy.clone(), dummy, 12)?;
}: _(SystemOrigin::Signed(caller), Default::default())
verify {
assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
assert_last_event::<T, I>(Event::MetadataCleared { asset_id: Default::default() }.into());
}

force_set_metadata {
Expand All @@ -339,7 +339,7 @@ benchmarks_instance_pallet! {
}: { call.dispatch_bypass_filter(origin)? }
verify {
let id = Default::default();
assert_last_event::<T, I>(Event::MetadataSet(id, name, symbol, decimals, false).into());
assert_last_event::<T, I>(Event::MetadataSet { asset_id: id, name, symbol, decimals, is_frozen: false }.into());
}

force_clear_metadata {
Expand All @@ -353,7 +353,7 @@ benchmarks_instance_pallet! {
let call = Call::<T, I>::force_clear_metadata { id: Default::default() };
}: { call.dispatch_bypass_filter(origin)? }
verify {
assert_last_event::<T, I>(Event::MetadataCleared(Default::default()).into());
assert_last_event::<T, I>(Event::MetadataCleared { asset_id: Default::default() }.into());
}

force_asset_status {
Expand All @@ -372,7 +372,7 @@ benchmarks_instance_pallet! {
};
}: { call.dispatch_bypass_filter(origin)? }
verify {
assert_last_event::<T, I>(Event::AssetStatusChanged(Default::default()).into());
assert_last_event::<T, I>(Event::AssetStatusChanged { asset_id: Default::default() }.into());
}

approve_transfer {
Expand All @@ -385,7 +385,7 @@ benchmarks_instance_pallet! {
let amount = 100u32.into();
}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup, amount)
verify {
assert_last_event::<T, I>(Event::ApprovedTransfer(id, caller, delegate, amount).into());
assert_last_event::<T, I>(Event::ApprovedTransfer { asset_id: id, source: caller, delegate, amount }.into());
}

transfer_approved {
Expand All @@ -405,7 +405,7 @@ benchmarks_instance_pallet! {
}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
verify {
assert!(T::Currency::reserved_balance(&owner).is_zero());
assert_event::<T, I>(Event::Transferred(id, owner, dest, amount).into());
assert_event::<T, I>(Event::Transferred { asset_id: id, from: owner, to: dest, amount }.into());
}

cancel_approval {
Expand All @@ -420,7 +420,7 @@ benchmarks_instance_pallet! {
Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
}: _(SystemOrigin::Signed(caller.clone()), id, delegate_lookup)
verify {
assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
assert_last_event::<T, I>(Event::ApprovalCancelled { asset_id: id, owner: caller, delegate }.into());
}

force_cancel_approval {
Expand All @@ -435,7 +435,7 @@ benchmarks_instance_pallet! {
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, I>(Event::ApprovalCancelled(id, caller, delegate).into());
assert_last_event::<T, I>(Event::ApprovalCancelled { asset_id: id, owner: caller, delegate }.into());
}

impl_benchmark_test_suite!(Assets, crate::mock::new_test_ext(), crate::mock::Test)
Expand Down
Loading