Revert to record_last_event

Author: raymondkfcheung

polkadot/xcm/pallet-xcm/src/lib.rs

@@ -849,9 +849,6 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type EmittedEvent<T: Config> = StorageValue<_, <T as frame_system::Config>::RuntimeEvent>;
 
-	#[pallet::storage]
-	pub type EmittedEventAsString<T: Config> = StorageValue<_, String, ValueQuery>;
-
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
 		#[serde(skip)]
@@ -3542,18 +3539,20 @@ impl<T: Config> RecordXcm for Pallet<T> {
 		RecordedXcm::<T>::put(xcm);
 	}
 
-	fn record_event(event: String) {
-		tracing::debug!(?event, "-> Recording the last event");
-		EmittedEventAsString::<T>::put(format!("{:?}", event.clone()));
-		// EmittedEvent::<T>::put(event);
-		let event = EmittedEvent::<T>::get();
-		tracing::debug!(?event, "<- Recorded the last event");
+	fn record_last_event() {
+		let records = frame_system::Pallet::<T>::events();
+		if let Some(record) = records.last() {
+			let event = record.event.clone();
+			tracing::debug!(?event, "-> Recording the last event");
+			EmittedEvent::<T>::put(event);
+			let event = EmittedEvent::<T>::get();
+			tracing::debug!(?event, "<- Recorded the last event");
+		}
 	}
 
 	fn emitted_event() -> Option<Self::RuntimeEvent> {
 		let event = EmittedEvent::<T>::get();
-		let event_as_string = EmittedEventAsString::<T>::get();
-		tracing::debug!(?event, ?event_as_string, "Emitted");
+		tracing::debug!(?event, "Emitted");
 		event
 	}
 }

polkadot/xcm/xcm-executor/src/lib.rs

@@ -453,15 +453,15 @@ impl<Config: config::Config> XcmExecutor<Config> {
 			},
 			Err(error) => {
 				tracing::debug!(target: "xcm::send", ?error, "XCM failed to deliver with error");
-				if Config::XcmRecorder::should_record() {
-					Config::XcmRecorder::record_event("error.emit_send_failure_event()".to_string());
-				}
 				Config::XcmEventEmitter::emit_send_failure_event(
 					self.original_origin.clone(),
 					dest,
 					error.clone(),
 					self.context.message_id,
 				);
+				if Config::XcmRecorder::should_record() {
+					Config::XcmRecorder::record_last_event();
+				}
 				Err(error.into())
 			},
 		}
@@ -858,7 +858,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 							self.context.message_id,
 						);
 						if Config::XcmRecorder::should_record() {
-							Config::XcmRecorder::record_event("emit_process_failure_event".to_string());
+							Config::XcmRecorder::record_last_event();
 						}
 						*r = Err(ExecutorError {
 							index: i as u32,

polkadot/xcm/xcm-executor/src/traits/record_xcm.rs

@@ -32,7 +32,7 @@ pub trait RecordXcm {
 	/// Record `xcm`.
 	fn record(xcm: Xcm<()>);
 	/// Record the last event.
-	fn record_event(event: String);
+	fn record_last_event();
 	/// Get emitted events.
 	fn emitted_event() -> Option<Self::RuntimeEvent>;
 }
@@ -52,7 +52,7 @@ impl RecordXcm for () {
 
 	fn record(_: Xcm<()>) {}
 
-	fn record_event(_event: String) {}
+	fn record_last_event() {}
 
 	fn emitted_event() -> Option<Self::RuntimeEvent> { None }
 }