pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 19:17:58 +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/proxy/src/benchmarking.rs
+2 -6
View File
@@ -20,7 +20,7 @@
#![cfg(feature = "runtime-benchmarks")]
use super::*;
use frame_system::{RawOrigin, EventRecord};
use frame_system::RawOrigin;
use frame_benchmarking::{benchmarks, account, whitelisted_caller, impl_benchmark_test_suite};
use sp_runtime::traits::Bounded;
use crate::Pallet as Proxy;
@@ -28,11 +28,7 @@ use crate::Pallet as Proxy;
const SEED: u32 = 0;
fn assert_last_event<T: Config>(generic_event: <T as Config>::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
let EventRecord { event, .. } = &events[events.len() - 1];
assert_eq!(event, &system_event);
frame_system::Pallet::<T>::assert_last_event(generic_event.into());
}
fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(), &'static str> {
substrate/frame/proxy/src/tests.rs
+17 -25
View File
@@ -164,14 +164,6 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
ext
}
fn last_event() -> Event {
system::Pallet::<Test>::events().pop().expect("Event expected").event
}
fn expect_event<E: Into<Event>>(e: E) {
assert_eq!(last_event(), e.into());
}
fn last_events(n: usize) -> Vec<Event> {
system::Pallet::<Test>::events().into_iter().rev().take(n).rev().map(|e| e.event).collect()
}
@@ -311,11 +303,11 @@ fn filtering_works() {
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
let derivative_id = Utility::derivative_account_id(1, 0);
assert!(Balances::mutate_account(&derivative_id, |a| a.free = 1000).is_ok());
@@ -323,17 +315,17 @@ fn filtering_works() {
let call = Box::new(Call::Utility(UtilityCall::as_derivative(0, inner.clone())));
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
let call = Box::new(Call::Utility(UtilityCall::batch(vec![*inner])));
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_events(vec![
UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
@@ -345,7 +337,7 @@ fn filtering_works() {
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_events(vec![UtilityEvent::BatchCompleted.into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_events(vec![
UtilityEvent::BatchInterrupted(0, DispatchError::BadOrigin).into(),
@@ -354,9 +346,9 @@ fn filtering_works() {
let call = Box::new(Call::Proxy(ProxyCall::remove_proxies()));
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_events(vec![BalancesEvent::<Test>::Unreserved(1, 5).into(), ProxyEvent::ProxyExecuted(Ok(())).into()]);
});
@@ -413,18 +405,18 @@ fn proxying_works() {
Error::<Test>::NotProxy
);
assert_ok!(Proxy::proxy(Origin::signed(2), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_eq!(Balances::free_balance(6), 1);
let call = Box::new(Call::System(SystemCall::set_code(vec![])));
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
let call = Box::new(Call::Balances(BalancesCall::transfer_keep_alive(6, 1)));
assert_ok!(Call::Proxy(super::Call::proxy(1, None, call.clone())).dispatch(Origin::signed(2)));
expect_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(DispatchError::BadOrigin)).into());
assert_ok!(Proxy::proxy(Origin::signed(3), 1, None, call.clone()));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_eq!(Balances::free_balance(6), 2);
});
}
@@ -434,7 +426,7 @@ fn anonymous_works() {
new_test_ext().execute_with(|| {
assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::Any, 0, 0));
let anon = Proxy::anonymous_account(&1, &ProxyType::Any, 0, None);
expect_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0));
System::assert_last_event(ProxyEvent::AnonymousCreated(anon.clone(), 1, ProxyType::Any, 0).into());
// other calls to anonymous allowed as long as they're not exactly the same.
assert_ok!(Proxy::anonymous(Origin::signed(1), ProxyType::JustTransfer, 0, 0));
@@ -451,13 +443,13 @@ fn anonymous_works() {
let call = Box::new(Call::Balances(BalancesCall::transfer(6, 1)));
assert_ok!(Balances::transfer(Origin::signed(3), anon, 5));
assert_ok!(Proxy::proxy(Origin::signed(1), anon, None, call));
expect_event(ProxyEvent::ProxyExecuted(Ok(())));
System::assert_last_event(ProxyEvent::ProxyExecuted(Ok(())).into());
assert_eq!(Balances::free_balance(6), 1);
let call = Box::new(Call::Proxy(ProxyCall::kill_anonymous(1, ProxyType::Any, 0, 1, 0)));
assert_ok!(Proxy::proxy(Origin::signed(2), anon2, None, call.clone()));
let de = DispatchError::from(Error::<Test>::NoPermission).stripped();
expect_event(ProxyEvent::ProxyExecuted(Err(de)));
System::assert_last_event(ProxyEvent::ProxyExecuted(Err(de)).into());
assert_noop!(
Proxy::kill_anonymous(Origin::signed(1), 1, ProxyType::Any, 0, 1, 0),
Error::<Test>::NoPermission