Companion for #11831

xcm/pallet-xcm/src/mock.rs

@@ -299,11 +299,11 @@ impl pallet_test_notifier::Config for Test {
 	type Call = Call;
 }
 
-pub(crate) fn last_event() -> PalletEvent {
-	System::events().pop().expect("PalletEvent expected").event
+pub(crate) fn last_event() -> RuntimeEvent {
+	System::events().pop().expect("RuntimeEvent expected").event
 }
 
-pub(crate) fn last_events(n: usize) -> Vec<PalletEvent> {
+pub(crate) fn last_events(n: usize) -> Vec<RuntimeEvent> {
 	System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect()
 }
 

xcm/pallet-xcm/src/tests.rs

@@ -84,12 +84,12 @@ fn report_outcome_notify_works() {
 		assert_eq!(
 			last_events(2),
 			vec![
-				PalletEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived(
+				RuntimeEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived(
 					Parachain(PARA_ID).into(),
 					0,
 					Response::ExecutionResult(None),
 				)),
-				PalletEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)),
+				RuntimeEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)),
 			]
 		);
 		assert_eq!(crate::Queries::<Test>::iter().collect::<Vec<_>>(), vec![]);
@@ -139,7 +139,7 @@ fn report_outcome_works() {
 		assert_eq!(r, Outcome::Complete(1_000));
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::ResponseReady(
+			RuntimeEvent::XcmPallet(crate::PalletEvent::ResponseReady(
 				0,
 				Response::ExecutionResult(None),
 			))
@@ -183,7 +183,7 @@ fn send_works() {
 		);
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message))
 		);
 	});
 }
@@ -255,7 +255,7 @@ fn teleport_assets_works() {
 		let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap();
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -299,7 +299,7 @@ fn limmited_teleport_assets_works() {
 		let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap();
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -341,7 +341,7 @@ fn unlimmited_teleport_assets_works() {
 		);
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -389,7 +389,7 @@ fn reserve_transfer_assets_works() {
 		let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap();
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -438,7 +438,7 @@ fn limited_reserve_transfer_assets_works() {
 		let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap();
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -485,7 +485,7 @@ fn unlimited_reserve_transfer_assets_works() {
 		);
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -518,7 +518,7 @@ fn execute_withdraw_to_deposit_works() {
 		assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT);
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight)))
 		);
 	});
 }
@@ -554,12 +554,12 @@ fn trapped_assets_can_be_claimed() {
 		assert_eq!(
 			last_events(2),
 			vec![
-				PalletEvent::XcmPallet(crate::PalletEvent::AssetsTrapped(
+				RuntimeEvent::XcmPallet(crate::PalletEvent::AssetsTrapped(
 					hash.clone(),
 					source,
 					vma
 				)),
-				PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(
+				RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(
 					5 * BaseXcmWeight::get()
 				)))
 			]
@@ -597,7 +597,7 @@ fn trapped_assets_can_be_claimed() {
 		));
 		assert_eq!(
 			last_event(),
-			PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete(
+			RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete(
 				BaseXcmWeight::get(),
 				XcmError::UnknownClaim
 			)))