pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 15:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

frame system: add event util functions for tests. (#8734)

Browse Source 
* frame system: add event util functions for tests.

* URemove unused fn.

* Apply review suggestions.
This commit is contained in:
Shaun Wang
2021-05-13 00:17:03 +12:00
committed by GitHub
parent d89a01cd96
commit ad584733e9
18 changed files with 85 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/balances/src/tests.rs
+5 -19
View File
@@ -54,10 +54,6 @@ macro_rules! decl_tests {
evt
}
fn last_event() -> Event {
system::Pallet::<Test>::events().pop().expect("Event expected").event
}
#[test]
fn basic_locking_should_work() {
<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
@@ -467,9 +463,8 @@ macro_rules! decl_tests {
let _ = Balances::deposit_creating(&2, 1);
assert_ok!(Balances::reserve(&1, 110));
assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
assert_eq!(
last_event(),
Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free)),
System::assert_last_event(
Event::pallet_balances(crate::Event::ReserveRepatriated(1, 2, 41, Status::Free))
);
assert_eq!(Balances::reserved_balance(1), 69);
assert_eq!(Balances::free_balance(1), 0);
@@ -688,27 +683,18 @@ macro_rules! decl_tests {
System::set_block_number(2);
assert_ok!(Balances::reserve(&1, 10));
assert_eq!(
last_event(),
Event::pallet_balances(crate::Event::Reserved(1, 10)),
);
System::assert_last_event(Event::pallet_balances(crate::Event::Reserved(1, 10)));
System::set_block_number(3);
assert!(Balances::unreserve(&1, 5).is_zero());
assert_eq!(
last_event(),
Event::pallet_balances(crate::Event::Unreserved(1, 5)),
);
System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
System::set_block_number(4);
assert_eq!(Balances::unreserve(&1, 6), 1);
// should only unreserve 5
assert_eq!(
last_event(),
Event::pallet_balances(crate::Event::Unreserved(1, 5)),
);
System::assert_last_event(Event::pallet_balances(crate::Event::Unreserved(1, 5)));
});
}
substrate/frame/balances/src/tests_reentrancy.rs
+8 -51
View File
@@ -46,10 +46,6 @@ use frame_system::RawOrigin;
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
type Block = frame_system::mocking::MockBlock<Test>;
fn last_event() -> Event {
system::Pallet::<Test>::events().pop().expect("Event expected").event
}
frame_support::construct_runtime!(
pub enum Test where
Block = Block,
@@ -189,23 +185,8 @@ fn transfer_dust_removal_tst1_should_work() {
// Number of events expected is 8
assert_eq!(System::events().len(), 11);
assert!(
System::events().iter().any(
|er|
er.event == Event::pallet_balances(
crate::Event::Transfer(2, 3, 450),
),
),
);
assert!(
System::events().iter().any(
|er|
er.event == Event::pallet_balances(
crate::Event::DustLost(2, 50)
),
),
);
System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 3, 450)));
System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
}
);
}
@@ -236,23 +217,8 @@ fn transfer_dust_removal_tst2_should_work() {
// Number of events expected is 8
assert_eq!(System::events().len(), 9);
assert!(
System::events().iter().any(
|er|
er.event == Event::pallet_balances(
crate::Event::Transfer(2, 1, 450),
),
),
);
assert!(
System::events().iter().any(
|er|
er.event == Event::pallet_balances(
crate::Event::DustLost(2, 50),
),
),
);
System::assert_has_event(Event::pallet_balances(crate::Event::Transfer(2, 1, 450)));
System::assert_has_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
}
);
}
@@ -292,20 +258,11 @@ fn repatriating_reserved_balance_dust_removal_should_work() {
// Number of events expected is 10
assert_eq!(System::events().len(), 10);
assert!(
System::events().iter().any(
|er|
er.event == Event::pallet_balances(
crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
),
),
);
assert_eq!(
last_event(),
Event::pallet_balances(crate::Event::DustLost(2, 50)),
);
System::assert_has_event(Event::pallet_balances(
crate::Event::ReserveRepatriated(2, 1, 450, Status::Free),
));
System::assert_last_event(Event::pallet_balances(crate::Event::DustLost(2, 50)));
}
);
}