Add serde renames and fix result types for crimp

Author: arjunr2

crates/wasmtime/src/runtime/rr/backend/crimp/events.rs

@@ -98,7 +98,7 @@ where
 /// anyhow results are not serialized directly. They need to specifically check
 /// for divergence between recorded and replayed effects with [EventError]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ResultEvent<T, E: EventError>(Result<T, E>);
+pub struct ResultEvent<T, E: EventError>(core::result::Result<T, E>);
 
 impl<T, E> ResultEvent<T, E>
 where

crates/wasmtime/src/runtime/rr/backend/crimp/events/component_events.rs

@@ -22,6 +22,7 @@ pub struct WasmFuncBeginEvent {
 
 /// A instantiatation event for a Wasm component.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)]
+#[serde(rename = "ComponentInstantiationEvent")]
 pub struct InstantiationEvent {
     /// Checksum of the bytecode used to instantiate the component
     pub component: WasmChecksum,
@@ -40,6 +41,7 @@ pub struct PostReturnEvent {
 
 /// A call event from Host into a Wasm component function.
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename = "ComponentWasmFuncEntryEvent")]
 pub struct WasmFuncEntryEvent {
     /// Raw values passed across call boundary.
     pub args: RRFuncArgVals,

crates/wasmtime/src/runtime/rr/backend/crimp/events/core_events.rs

@@ -35,6 +35,7 @@ impl From<FuncIndex> for RRModuleFuncIndex {
 
 /// A core Wasm module instantiatation event.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)]
+#[serde(rename = "CoreModuleInstantiationEvent")]
 pub struct InstantiationEvent {
     /// Checksum of the bytecode used to instantiate the module.
     pub module: WasmChecksum,
@@ -44,6 +45,7 @@ pub struct InstantiationEvent {
 
 /// A call event from Host into a core Wasm function.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[serde(rename = "CoreWasmFuncEntryEvent")]
 pub struct WasmFuncEntryEvent {
     /// Instance ID for the instantiated module.
     pub instance: RRModuleInstanceId,