Use correct Event type

open-web3-stack · Jan 27, 2023 · e199ed9 · e199ed9
1 parent 5f0faba
commit e199ed9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
@@ -39,12 +39,6 @@ pub const ID_3: LockIdentifier = *b"3       ";
 pub const RID_1: ReserveIdentifier = [1u8; 8];
 pub const RID_2: ReserveIdentifier = [2u8; 8];
 
-pub(super) fn events() -> Vec<self::Event> {
-	let evt = System::events().into_iter().map(|evt| evt.event).collect::<Vec<_>>();
-	System::reset_events();
-	evt
-}
-
 use crate as tokens;
 
 impl frame_system::Config for Runtime {

diff --git a/tokens/src/tests_events.rs b/tokens/src/tests_events.rs
@@ -6,6 +6,12 @@ use super::*;
 use frame_support::assert_ok;
 use mock::*;
 
+fn events() -> Vec<RuntimeEvent> {
+	let evt = System::events().into_iter().map(|evt| evt.event).collect::<Vec<_>>();
+	System::reset_events();
+	evt
+}
+
 #[test]
 fn pallet_multicurrency_deposit_events() {
 	ExtBuilder::default()
@@ -310,23 +316,23 @@ fn pallet_change_locks_events() {
 
 		// Locks: [10/DOT]
 		assert_ok!(Tokens::set_lock(ID_1, DOT, &ALICE, 10));
-		assert!(events().contains(&Event::Tokens(crate::Event::Locked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Locked {
 			currency_id: DOT,
 			who: ALICE,
 			amount: 10
 		})));
 
 		// Locks: [15/DOT]
 		assert_ok!(Tokens::set_lock(ID_1, DOT, &ALICE, 15));
-		assert!(events().contains(&Event::Tokens(crate::Event::Locked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Locked {
 			currency_id: DOT,
 			who: ALICE,
 			amount: 5
 		})));
 
 		// Locks: [15/DOT, 20/BTC]
 		assert_ok!(Tokens::set_lock(ID_1, BTC, &ALICE, 20));
-		assert!(events().contains(&Event::Tokens(crate::Event::Locked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Locked {
 			currency_id: BTC,
 			who: ALICE,
 			amount: 20
@@ -336,8 +342,8 @@ fn pallet_change_locks_events() {
 		assert_ok!(Tokens::set_lock(ID_2, DOT, &ALICE, 10));
 		for event in events() {
 			match event {
-				Event::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
-				Event::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
+				RuntimeEvent::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
+				RuntimeEvent::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
 				_ => continue,
 			}
 		}
@@ -346,8 +352,8 @@ fn pallet_change_locks_events() {
 		assert_ok!(Tokens::set_lock(ID_2, DOT, &ALICE, 12));
 		for event in events() {
 			match event {
-				Event::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
-				Event::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
+				RuntimeEvent::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
+				RuntimeEvent::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
 				_ => continue,
 			}
 		}
@@ -356,39 +362,39 @@ fn pallet_change_locks_events() {
 		assert_ok!(Tokens::set_lock(ID_2, DOT, &ALICE, 10));
 		for event in events() {
 			match event {
-				Event::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
-				Event::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
+				RuntimeEvent::Tokens(crate::Event::Locked { .. }) => assert!(false, "unexpected lock event"),
+				RuntimeEvent::Tokens(crate::Event::Unlocked { .. }) => assert!(false, "unexpected unlock event"),
 				_ => continue,
 			}
 		}
 
 		// Locks: [15/DOT, 20/BTC, 20/DOT]
 		assert_ok!(Tokens::set_lock(ID_2, DOT, &ALICE, 20));
-		assert!(events().contains(&Event::Tokens(crate::Event::Locked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Locked {
 			currency_id: DOT,
 			who: ALICE,
 			amount: 5
 		})));
 
 		// Locks: [15/DOT, 20/BTC, 16/DOT]
 		assert_ok!(Tokens::set_lock(ID_2, DOT, &ALICE, 16));
-		assert!(events().contains(&Event::Tokens(crate::Event::Unlocked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Unlocked {
 			currency_id: DOT,
 			who: ALICE,
 			amount: 4
 		})));
 
 		// Locks: [15/DOT, 12/BTC, 16/DOT]
 		assert_ok!(Tokens::set_lock(ID_1, BTC, &ALICE, 12));
-		assert!(events().contains(&Event::Tokens(crate::Event::Unlocked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Unlocked {
 			currency_id: BTC,
 			who: ALICE,
 			amount: 8
 		})));
 
 		// Locks: [15/DOT, 12/BTC]
 		assert_ok!(Tokens::remove_lock(ID_2, DOT, &ALICE));
-		assert!(events().contains(&Event::Tokens(crate::Event::Unlocked {
+		assert!(events().contains(&RuntimeEvent::Tokens(crate::Event::Unlocked {
 			currency_id: DOT,
 			who: ALICE,
 			amount: 1