From 7eba6c8c75980a0eaa810a52c2a9a54db06e64ab Mon Sep 17 00:00:00 2001 From: wangjj9219 <183318287@qq.com> Date: Fri, 21 May 2021 10:51:50 +0800 Subject: [PATCH 1/2] update event assertion in unit tests --- auction/src/tests.rs | 3 +- authority/src/tests.rs | 126 ++++++++++++++++++---------------- currencies/src/tests.rs | 16 ++--- gradually-update/src/tests.rs | 68 ++++++------------ oracle/src/tests.rs | 9 ++- tokens/src/tests.rs | 9 +-- unknown-tokens/src/tests.rs | 16 ++--- vesting/src/tests.rs | 4 +- 8 files changed, 103 insertions(+), 148 deletions(-) diff --git a/auction/src/tests.rs b/auction/src/tests.rs index 95e8619df..c8b8e694b 100644 --- a/auction/src/tests.rs +++ b/auction/src/tests.rs @@ -68,8 +68,7 @@ fn bid_should_work() { }) ); assert_ok!(AuctionModule::bid(Origin::signed(ALICE), 0, 20)); - let bid_event = Event::auction(crate::Event::Bid(0, ALICE, 20)); - assert!(System::events().iter().any(|record| record.event == bid_event)); + System::assert_has_event(Event::auction(crate::Event::Bid(0, ALICE, 20))); assert_eq!( AuctionModule::auction_info(0), Some(AuctionInfo { diff --git a/authority/src/tests.rs b/authority/src/tests.rs index 6a3c352c1..c433f69c5 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -74,22 +74,22 @@ fn schedule_dispatch_at_work() { true, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled( + System::assert_has_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 1, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); run_to_block(2); - let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( - (2, 0), - Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), - Ok(()), + System::assert_has_event(mock::Event::pallet_scheduler( + pallet_scheduler::Event::::Dispatched( + (2, 0), + Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), + Ok(()), + ), )); - assert!(System::events().iter().any(|record| record.event == event)); // with_delayed_origin = false assert_ok!(Authority::schedule_dispatch( @@ -99,16 +99,15 @@ fn schedule_dispatch_at_work() { false, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 2)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Scheduled( + OriginCaller::system(RawOrigin::Root), + 2, + ))); run_to_block(3); - let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( - (3, 0), - Some([0, 0, 2, 0, 0, 0].to_vec()), - Ok(()), + System::assert_has_event(mock::Event::pallet_scheduler( + pallet_scheduler::Event::::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())), )); - assert!(System::events().iter().any(|record| record.event == event)); }); } @@ -133,22 +132,22 @@ fn schedule_dispatch_after_work() { true, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled( + System::assert_has_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 0, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 1, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); run_to_block(2); - let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( - (2, 0), - Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), - Ok(()), + System::assert_has_event(mock::Event::pallet_scheduler( + pallet_scheduler::Event::::Dispatched( + (2, 0), + Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), + Ok(()), + ), )); - assert!(System::events().iter().any(|record| record.event == event)); // with_delayed_origin = false assert_ok!(Authority::schedule_dispatch( @@ -158,16 +157,15 @@ fn schedule_dispatch_after_work() { false, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 2)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Scheduled( + OriginCaller::system(RawOrigin::Root), + 2, + ))); run_to_block(3); - let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( - (3, 0), - Some([0, 0, 2, 0, 0, 0].to_vec()), - Ok(()), + System::assert_has_event(mock::Event::pallet_scheduler( + pallet_scheduler::Event::::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())), )); - assert!(System::events().iter().any(|record| record.event == event)); }); } @@ -188,14 +186,13 @@ fn fast_track_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled( + System::assert_has_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); let schedule_origin = { let origin: ::Origin = From::from(Origin::root()); @@ -214,15 +211,14 @@ fn fast_track_scheduled_dispatch_work() { 0, DispatchTime::At(4), )); - let event = mock::Event::authority(Event::FastTracked( + System::assert_has_event(mock::Event::authority(Event::FastTracked( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, 4, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); assert_ok!(Authority::schedule_dispatch( Origin::root(), @@ -231,8 +227,10 @@ fn fast_track_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Scheduled( + OriginCaller::system(RawOrigin::Root), + 1, + ))); assert_ok!(Authority::fast_track_scheduled_dispatch( Origin::root(), @@ -240,8 +238,11 @@ fn fast_track_scheduled_dispatch_work() { 1, DispatchTime::At(4), )); - let event = mock::Event::authority(Event::FastTracked(OriginCaller::system(RawOrigin::Root), 1, 4)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::FastTracked( + OriginCaller::system(RawOrigin::Root), + 1, + 4, + ))); }); } @@ -262,14 +263,13 @@ fn delay_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled( + System::assert_has_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); let schedule_origin = { let origin: ::Origin = From::from(Origin::root()); @@ -288,15 +288,14 @@ fn delay_scheduled_dispatch_work() { 0, 4, )); - let event = mock::Event::authority(Event::Delayed( + System::assert_has_event(mock::Event::authority(Event::Delayed( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, 5, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); assert_ok!(Authority::schedule_dispatch( Origin::root(), @@ -305,8 +304,10 @@ fn delay_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Scheduled( + OriginCaller::system(RawOrigin::Root), + 1, + ))); assert_ok!(Authority::delay_scheduled_dispatch( Origin::root(), @@ -314,8 +315,11 @@ fn delay_scheduled_dispatch_work() { 1, 4, )); - let event = mock::Event::authority(Event::Delayed(OriginCaller::system(RawOrigin::Root), 1, 5)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Delayed( + OriginCaller::system(RawOrigin::Root), + 1, + 5, + ))); }); } @@ -335,14 +339,13 @@ fn cancel_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled( + System::assert_has_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); let schedule_origin = { let origin: ::Origin = From::from(Origin::root()); @@ -356,14 +359,13 @@ fn cancel_scheduled_dispatch_work() { let pallets_origin = schedule_origin.caller().clone(); assert_ok!(Authority::cancel_scheduled_dispatch(Origin::root(), pallets_origin, 0)); - let event = mock::Event::authority(Event::Cancelled( + System::assert_has_event(mock::Event::authority(Event::Cancelled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), }), 0, - )); - assert!(System::events().iter().any(|record| record.event == event)); + ))); assert_ok!(Authority::schedule_dispatch( Origin::root(), @@ -372,15 +374,19 @@ fn cancel_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Scheduled( + OriginCaller::system(RawOrigin::Root), + 1, + ))); assert_ok!(Authority::cancel_scheduled_dispatch( Origin::root(), frame_system::RawOrigin::Root.into(), 1 )); - let event = mock::Event::authority(Event::Cancelled(OriginCaller::system(RawOrigin::Root), 1)); - assert!(System::events().iter().any(|record| record.event == event)); + System::assert_has_event(mock::Event::authority(Event::Cancelled( + OriginCaller::system(RawOrigin::Root), + 1, + ))); }); } diff --git a/currencies/src/tests.rs b/currencies/src/tests.rs index 30bee086a..2ad9bfe92 100644 --- a/currencies/src/tests.rs +++ b/currencies/src/tests.rs @@ -254,33 +254,25 @@ fn call_event_should_work() { assert_ok!(Currencies::transfer(Some(ALICE).into(), BOB, X_TOKEN_ID, 50)); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 50); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 150); - - let transferred_event = Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50))); assert_ok!(>::transfer( X_TOKEN_ID, &ALICE, &BOB, 10 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 40); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 160); - - let transferred_event = Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10))); assert_ok!(>::deposit( X_TOKEN_ID, &ALICE, 100 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 140); - - let transferred_event = Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100))); assert_ok!(>::withdraw( X_TOKEN_ID, &ALICE, 20 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 120); - - let transferred_event = Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20))); }); } diff --git a/gradually-update/src/tests.rs b/gradually-update/src/tests.rs index 345b82b2b..5a5c461db 100644 --- a/gradually-update/src/tests.rs +++ b/gradually-update/src/tests.rs @@ -31,15 +31,11 @@ fn gradually_update_should_work() { per_block: vec![1].try_into().unwrap(), }; assert_ok!(GraduallyUpdateModule::gradually_update(Origin::root(), update.clone())); - - let gradually_update_event = Event::gradually_update(crate::Event::GraduallyUpdateAdded( + System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( update.key, update.per_block, update.target_value, - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_event)); + ))); }); } @@ -93,24 +89,19 @@ fn cancel_gradually_update_should_work() { per_block: vec![1].try_into().unwrap(), }; assert_ok!(GraduallyUpdateModule::gradually_update(Origin::root(), update.clone())); - let gradually_update_event = Event::gradually_update(crate::Event::GraduallyUpdateAdded( + System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( update.key.clone(), update.per_block, update.target_value, - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_event)); + ))); assert_ok!(GraduallyUpdateModule::cancel_gradually_update( Origin::root(), update.key.clone() )); - let cancel_gradually_update_event = - Event::gradually_update(crate::Event::GraduallyUpdateCancelled(update.key.clone())); - assert!(System::events() - .iter() - .any(|record| record.event == cancel_gradually_update_event)); + System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateCancelled( + update.key.clone(), + ))); }); } @@ -151,16 +142,12 @@ fn add_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(10); assert_eq!(storage_get(&update.key), vec![10]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + println!("Length {}", System::events().len()); + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 10, update.key.clone(), vec![10].try_into().unwrap(), - )); - println!("Length {}", System::events().len()); - assert!(System::events().iter().any(|record| { - println!("{:?}", record.event); - record.event == gradually_update_blocknumber_event - })); + ))); assert_eq!(System::events().len(), 2); GraduallyUpdateModule::on_finalize(15); @@ -169,26 +156,20 @@ fn add_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(20); assert_eq!(storage_get(&update.key), vec![20]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 20, update.key.clone(), vec![20].try_into().unwrap(), - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_blocknumber_event)); + ))); assert_eq!(System::events().len(), 3); GraduallyUpdateModule::on_finalize(40); assert_eq!(storage_get(&update.key), vec![30]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 40, update.key.clone(), vec![30].try_into().unwrap(), - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_blocknumber_event)); + ))); }); } @@ -209,14 +190,11 @@ fn sub_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(10); assert_eq!(storage_get(&update.key), vec![20]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 10, update.key.clone(), vec![20].try_into().unwrap(), - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_blocknumber_event)); + ))); assert_eq!(System::events().len(), 2); GraduallyUpdateModule::on_finalize(15); @@ -225,26 +203,20 @@ fn sub_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(20); assert_eq!(storage_get(&update.key), vec![10]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 20, update.key.clone(), vec![10].try_into().unwrap(), - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_blocknumber_event)); + ))); assert_eq!(System::events().len(), 3); GraduallyUpdateModule::on_finalize(40); assert_eq!(storage_get(&update.key), vec![5]); - let gradually_update_blocknumber_event = Event::gradually_update(crate::Event::Updated( + System::assert_has_event(Event::gradually_update(crate::Event::Updated( 40, update.key.clone(), vec![5].try_into().unwrap(), - )); - assert!(System::events() - .iter() - .any(|record| record.event == gradually_update_blocknumber_event)); + ))); }); } diff --git a/oracle/src/tests.rs b/oracle/src/tests.rs index 423fe2a82..628faf86f 100644 --- a/oracle/src/tests.rs +++ b/oracle/src/tests.rs @@ -21,11 +21,10 @@ fn should_feed_values_from_member() { .pays_fee, Pays::No ); - - let new_feed_data_event = Event::oracle(crate::Event::NewFeedData(1, vec![(50, 1000), (51, 900), (52, 800)])); - assert!(System::events() - .iter() - .any(|record| record.event == new_feed_data_event)); + System::assert_has_event(Event::oracle(crate::Event::NewFeedData( + 1, + vec![(50, 1000), (51, 900), (52, 800)], + ))); assert_eq!( ModuleOracle::raw_values(&account_id, &50), diff --git a/tokens/src/tests.rs b/tokens/src/tests.rs index 02a40973c..8cec8e6b8 100644 --- a/tokens/src/tests.rs +++ b/tokens/src/tests.rs @@ -62,8 +62,7 @@ fn remove_dust_work() { assert_eq!(Tokens::free_balance(DOT, &DustAccount::get()), 1); assert_eq!(System::providers(&DustAccount::get()), 1); - let dust_lost_event = Event::tokens(crate::Event::DustLost(ALICE, DOT, 1)); - assert!(System::events().iter().any(|record| record.event == dust_lost_event)); + System::assert_has_event(Event::tokens(crate::Event::DustLost(ALICE, DOT, 1))); }); } @@ -306,8 +305,7 @@ fn transfer_should_work() { assert_eq!(Tokens::free_balance(DOT, &BOB), 150); assert_eq!(Tokens::total_issuance(DOT), 200); - let transferred_event = Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 50)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 50))); assert_noop!( Tokens::transfer(Some(ALICE).into(), BOB, DOT, 60), @@ -328,8 +326,7 @@ fn transfer_all_should_work() { assert_eq!(Tokens::free_balance(DOT, &ALICE), 0); assert_eq!(Tokens::free_balance(DOT, &BOB), 200); - let transferred_event = Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 100)); - assert!(System::events().iter().any(|record| record.event == transferred_event)); + System::assert_has_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 100))); }); } diff --git a/unknown-tokens/src/tests.rs b/unknown-tokens/src/tests.rs index cc5c60686..d9313fba8 100644 --- a/unknown-tokens/src/tests.rs +++ b/unknown-tokens/src/tests.rs @@ -38,9 +38,7 @@ fn deposit_concrete_fungible_asset_works() { UnknownTokens::concrete_fungible_balances(&MOCK_RECIPIENT, &MOCK_CONCRETE_FUNGIBLE_ID), 3 ); - - let deposited_event = Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT)); - assert!(System::events().iter().any(|record| record.event == deposited_event)); + System::assert_has_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); // overflow case let max_asset = concrete_fungible(u128::max_value()); @@ -60,9 +58,7 @@ fn deposit_abstract_fungible_asset() { UnknownTokens::abstract_fungible_balances(&MOCK_RECIPIENT, &mock_abstract_fungible_id()), 3 ); - - let deposited_event = Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT)); - assert!(System::events().iter().any(|record| record.event == deposited_event)); + System::assert_has_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); // overflow case let max_asset = abstract_fungible(u128::max_value()); @@ -98,9 +94,7 @@ fn withdraw_concrete_fungible_asset_works() { UnknownTokens::concrete_fungible_balances(&MOCK_RECIPIENT, &MOCK_CONCRETE_FUNGIBLE_ID), 0 ); - - let withdrawn_event = Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT)); - assert!(System::events().iter().any(|record| record.event == withdrawn_event)); + System::assert_has_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); // balance too low case assert_err!( @@ -121,9 +115,7 @@ fn withdraw_abstract_fungible_asset_works() { UnknownTokens::abstract_fungible_balances(&MOCK_RECIPIENT, &mock_abstract_fungible_id()), 0 ); - - let withdrawn_event = Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT)); - assert!(System::events().iter().any(|record| record.event == withdrawn_event)); + System::assert_has_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); // balance too low case assert_err!( diff --git a/vesting/src/tests.rs b/vesting/src/tests.rs index 35cdc049e..4ce959539 100644 --- a/vesting/src/tests.rs +++ b/vesting/src/tests.rs @@ -66,9 +66,7 @@ fn vested_transfer_works() { }; assert_ok!(Vesting::vested_transfer(Origin::signed(ALICE), BOB, schedule.clone())); assert_eq!(Vesting::vesting_schedules(&BOB), vec![schedule.clone()]); - - let vested_event = Event::vesting(crate::Event::VestingScheduleAdded(ALICE, BOB, schedule)); - assert!(System::events().iter().any(|record| record.event == vested_event)); + System::assert_has_event(Event::vesting(crate::Event::VestingScheduleAdded(ALICE, BOB, schedule))); }); } From 1b39abe82fd08dab055307c13f18d0c5bf731eaa Mon Sep 17 00:00:00 2001 From: wangjj9219 <183318287@qq.com> Date: Fri, 21 May 2021 11:01:49 +0800 Subject: [PATCH 2/2] use assert_last_event to assert --- auction/src/tests.rs | 2 +- authority/src/tests.rs | 40 +++++++++++++++++------------------ currencies/src/tests.rs | 8 +++---- gradually-update/src/tests.rs | 18 ++++++++-------- oracle/src/tests.rs | 2 +- tokens/src/tests.rs | 6 +++--- unknown-tokens/src/tests.rs | 8 +++---- vesting/src/tests.rs | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/auction/src/tests.rs b/auction/src/tests.rs index c8b8e694b..2aca6396e 100644 --- a/auction/src/tests.rs +++ b/auction/src/tests.rs @@ -68,7 +68,7 @@ fn bid_should_work() { }) ); assert_ok!(AuctionModule::bid(Origin::signed(ALICE), 0, 20)); - System::assert_has_event(Event::auction(crate::Event::Bid(0, ALICE, 20))); + System::assert_last_event(Event::auction(crate::Event::Bid(0, ALICE, 20))); assert_eq!( AuctionModule::auction_info(0), Some(AuctionInfo { diff --git a/authority/src/tests.rs b/authority/src/tests.rs index c433f69c5..8c0a538ff 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -74,7 +74,7 @@ fn schedule_dispatch_at_work() { true, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -83,7 +83,7 @@ fn schedule_dispatch_at_work() { ))); run_to_block(2); - System::assert_has_event(mock::Event::pallet_scheduler( + System::assert_last_event(mock::Event::pallet_scheduler( pallet_scheduler::Event::::Dispatched( (2, 0), Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), @@ -99,13 +99,13 @@ fn schedule_dispatch_at_work() { false, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::system(RawOrigin::Root), 2, ))); run_to_block(3); - System::assert_has_event(mock::Event::pallet_scheduler( + System::assert_last_event(mock::Event::pallet_scheduler( pallet_scheduler::Event::::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())), )); }); @@ -132,7 +132,7 @@ fn schedule_dispatch_after_work() { true, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 0, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -141,7 +141,7 @@ fn schedule_dispatch_after_work() { ))); run_to_block(2); - System::assert_has_event(mock::Event::pallet_scheduler( + System::assert_last_event(mock::Event::pallet_scheduler( pallet_scheduler::Event::::Dispatched( (2, 0), Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), @@ -157,13 +157,13 @@ fn schedule_dispatch_after_work() { false, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::system(RawOrigin::Root), 2, ))); run_to_block(3); - System::assert_has_event(mock::Event::pallet_scheduler( + System::assert_last_event(mock::Event::pallet_scheduler( pallet_scheduler::Event::::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())), )); }); @@ -186,7 +186,7 @@ fn fast_track_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -211,7 +211,7 @@ fn fast_track_scheduled_dispatch_work() { 0, DispatchTime::At(4), )); - System::assert_has_event(mock::Event::authority(Event::FastTracked( + System::assert_last_event(mock::Event::authority(Event::FastTracked( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -227,7 +227,7 @@ fn fast_track_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::system(RawOrigin::Root), 1, ))); @@ -238,7 +238,7 @@ fn fast_track_scheduled_dispatch_work() { 1, DispatchTime::At(4), )); - System::assert_has_event(mock::Event::authority(Event::FastTracked( + System::assert_last_event(mock::Event::authority(Event::FastTracked( OriginCaller::system(RawOrigin::Root), 1, 4, @@ -263,7 +263,7 @@ fn delay_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -288,7 +288,7 @@ fn delay_scheduled_dispatch_work() { 0, 4, )); - System::assert_has_event(mock::Event::authority(Event::Delayed( + System::assert_last_event(mock::Event::authority(Event::Delayed( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -304,7 +304,7 @@ fn delay_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::system(RawOrigin::Root), 1, ))); @@ -315,7 +315,7 @@ fn delay_scheduled_dispatch_work() { 1, 4, )); - System::assert_has_event(mock::Event::authority(Event::Delayed( + System::assert_last_event(mock::Event::authority(Event::Delayed( OriginCaller::system(RawOrigin::Root), 1, 5, @@ -339,7 +339,7 @@ fn cancel_scheduled_dispatch_work() { true, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -359,7 +359,7 @@ fn cancel_scheduled_dispatch_work() { let pallets_origin = schedule_origin.caller().clone(); assert_ok!(Authority::cancel_scheduled_dispatch(Origin::root(), pallets_origin, 0)); - System::assert_has_event(mock::Event::authority(Event::Cancelled( + System::assert_last_event(mock::Event::authority(Event::Cancelled( OriginCaller::authority(DelayedOrigin { delay: 1, origin: Box::new(OriginCaller::system(RawOrigin::Root)), @@ -374,7 +374,7 @@ fn cancel_scheduled_dispatch_work() { false, Box::new(call.clone()) )); - System::assert_has_event(mock::Event::authority(Event::Scheduled( + System::assert_last_event(mock::Event::authority(Event::Scheduled( OriginCaller::system(RawOrigin::Root), 1, ))); @@ -384,7 +384,7 @@ fn cancel_scheduled_dispatch_work() { frame_system::RawOrigin::Root.into(), 1 )); - System::assert_has_event(mock::Event::authority(Event::Cancelled( + System::assert_last_event(mock::Event::authority(Event::Cancelled( OriginCaller::system(RawOrigin::Root), 1, ))); diff --git a/currencies/src/tests.rs b/currencies/src/tests.rs index 2ad9bfe92..0221d22e0 100644 --- a/currencies/src/tests.rs +++ b/currencies/src/tests.rs @@ -254,25 +254,25 @@ fn call_event_should_work() { assert_ok!(Currencies::transfer(Some(ALICE).into(), BOB, X_TOKEN_ID, 50)); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 50); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 150); - System::assert_has_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50))); + System::assert_last_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50))); assert_ok!(>::transfer( X_TOKEN_ID, &ALICE, &BOB, 10 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 40); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 160); - System::assert_has_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10))); + System::assert_last_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10))); assert_ok!(>::deposit( X_TOKEN_ID, &ALICE, 100 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 140); - System::assert_has_event(Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100))); + System::assert_last_event(Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100))); assert_ok!(>::withdraw( X_TOKEN_ID, &ALICE, 20 )); assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 120); - System::assert_has_event(Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20))); + System::assert_last_event(Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20))); }); } diff --git a/gradually-update/src/tests.rs b/gradually-update/src/tests.rs index 5a5c461db..856228984 100644 --- a/gradually-update/src/tests.rs +++ b/gradually-update/src/tests.rs @@ -31,7 +31,7 @@ fn gradually_update_should_work() { per_block: vec![1].try_into().unwrap(), }; assert_ok!(GraduallyUpdateModule::gradually_update(Origin::root(), update.clone())); - System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( + System::assert_last_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( update.key, update.per_block, update.target_value, @@ -89,7 +89,7 @@ fn cancel_gradually_update_should_work() { per_block: vec![1].try_into().unwrap(), }; assert_ok!(GraduallyUpdateModule::gradually_update(Origin::root(), update.clone())); - System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( + System::assert_last_event(Event::gradually_update(crate::Event::GraduallyUpdateAdded( update.key.clone(), update.per_block, update.target_value, @@ -99,7 +99,7 @@ fn cancel_gradually_update_should_work() { Origin::root(), update.key.clone() )); - System::assert_has_event(Event::gradually_update(crate::Event::GraduallyUpdateCancelled( + System::assert_last_event(Event::gradually_update(crate::Event::GraduallyUpdateCancelled( update.key.clone(), ))); }); @@ -143,7 +143,7 @@ fn add_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(10); assert_eq!(storage_get(&update.key), vec![10]); println!("Length {}", System::events().len()); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 10, update.key.clone(), vec![10].try_into().unwrap(), @@ -156,7 +156,7 @@ fn add_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(20); assert_eq!(storage_get(&update.key), vec![20]); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 20, update.key.clone(), vec![20].try_into().unwrap(), @@ -165,7 +165,7 @@ fn add_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(40); assert_eq!(storage_get(&update.key), vec![30]); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 40, update.key.clone(), vec![30].try_into().unwrap(), @@ -190,7 +190,7 @@ fn sub_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(10); assert_eq!(storage_get(&update.key), vec![20]); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 10, update.key.clone(), vec![20].try_into().unwrap(), @@ -203,7 +203,7 @@ fn sub_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(20); assert_eq!(storage_get(&update.key), vec![10]); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 20, update.key.clone(), vec![10].try_into().unwrap(), @@ -212,7 +212,7 @@ fn sub_on_finalize_should_work() { GraduallyUpdateModule::on_finalize(40); assert_eq!(storage_get(&update.key), vec![5]); - System::assert_has_event(Event::gradually_update(crate::Event::Updated( + System::assert_last_event(Event::gradually_update(crate::Event::Updated( 40, update.key.clone(), vec![5].try_into().unwrap(), diff --git a/oracle/src/tests.rs b/oracle/src/tests.rs index 628faf86f..79f0fccf6 100644 --- a/oracle/src/tests.rs +++ b/oracle/src/tests.rs @@ -21,7 +21,7 @@ fn should_feed_values_from_member() { .pays_fee, Pays::No ); - System::assert_has_event(Event::oracle(crate::Event::NewFeedData( + System::assert_last_event(Event::oracle(crate::Event::NewFeedData( 1, vec![(50, 1000), (51, 900), (52, 800)], ))); diff --git a/tokens/src/tests.rs b/tokens/src/tests.rs index 8cec8e6b8..0e027068a 100644 --- a/tokens/src/tests.rs +++ b/tokens/src/tests.rs @@ -62,7 +62,7 @@ fn remove_dust_work() { assert_eq!(Tokens::free_balance(DOT, &DustAccount::get()), 1); assert_eq!(System::providers(&DustAccount::get()), 1); - System::assert_has_event(Event::tokens(crate::Event::DustLost(ALICE, DOT, 1))); + System::assert_last_event(Event::tokens(crate::Event::DustLost(ALICE, DOT, 1))); }); } @@ -305,7 +305,7 @@ fn transfer_should_work() { assert_eq!(Tokens::free_balance(DOT, &BOB), 150); assert_eq!(Tokens::total_issuance(DOT), 200); - System::assert_has_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 50))); + System::assert_last_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 50))); assert_noop!( Tokens::transfer(Some(ALICE).into(), BOB, DOT, 60), @@ -326,7 +326,7 @@ fn transfer_all_should_work() { assert_eq!(Tokens::free_balance(DOT, &ALICE), 0); assert_eq!(Tokens::free_balance(DOT, &BOB), 200); - System::assert_has_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 100))); + System::assert_last_event(Event::tokens(crate::Event::Transferred(DOT, ALICE, BOB, 100))); }); } diff --git a/unknown-tokens/src/tests.rs b/unknown-tokens/src/tests.rs index d9313fba8..333478347 100644 --- a/unknown-tokens/src/tests.rs +++ b/unknown-tokens/src/tests.rs @@ -38,7 +38,7 @@ fn deposit_concrete_fungible_asset_works() { UnknownTokens::concrete_fungible_balances(&MOCK_RECIPIENT, &MOCK_CONCRETE_FUNGIBLE_ID), 3 ); - System::assert_has_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); + System::assert_last_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); // overflow case let max_asset = concrete_fungible(u128::max_value()); @@ -58,7 +58,7 @@ fn deposit_abstract_fungible_asset() { UnknownTokens::abstract_fungible_balances(&MOCK_RECIPIENT, &mock_abstract_fungible_id()), 3 ); - System::assert_has_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); + System::assert_last_event(Event::unknown_tokens(crate::Event::Deposited(asset, MOCK_RECIPIENT))); // overflow case let max_asset = abstract_fungible(u128::max_value()); @@ -94,7 +94,7 @@ fn withdraw_concrete_fungible_asset_works() { UnknownTokens::concrete_fungible_balances(&MOCK_RECIPIENT, &MOCK_CONCRETE_FUNGIBLE_ID), 0 ); - System::assert_has_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); + System::assert_last_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); // balance too low case assert_err!( @@ -115,7 +115,7 @@ fn withdraw_abstract_fungible_asset_works() { UnknownTokens::abstract_fungible_balances(&MOCK_RECIPIENT, &mock_abstract_fungible_id()), 0 ); - System::assert_has_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); + System::assert_last_event(Event::unknown_tokens(crate::Event::Withdrawn(asset.clone(), MOCK_RECIPIENT))); // balance too low case assert_err!( diff --git a/vesting/src/tests.rs b/vesting/src/tests.rs index 4ce959539..5331e513d 100644 --- a/vesting/src/tests.rs +++ b/vesting/src/tests.rs @@ -66,7 +66,7 @@ fn vested_transfer_works() { }; assert_ok!(Vesting::vested_transfer(Origin::signed(ALICE), BOB, schedule.clone())); assert_eq!(Vesting::vesting_schedules(&BOB), vec![schedule.clone()]); - System::assert_has_event(Event::vesting(crate::Event::VestingScheduleAdded(ALICE, BOB, schedule))); + System::assert_last_event(Event::vesting(crate::Event::VestingScheduleAdded(ALICE, BOB, schedule))); }); }