Fix merge issues

Author: Sushisource

crates/common-wasm/build.rs

@@ -19,8 +19,10 @@ const SERDE_DERIVE_PREFIXES: &[&str] = &[
     ".grpc",
     ".temporal.api.activity",
     ".temporal.api.batch",
+    ".temporal.api.callback",
     ".temporal.api.cloud",
     ".temporal.api.command",
+    ".temporal.api.compute",
     ".temporal.api.deployment",
     ".temporal.api.filter",
     ".temporal.api.history",

crates/common-wasm/src/protos/mod.rs

@@ -299,6 +299,7 @@ pub mod coresdk {
                         failure_info: Some(failure::FailureInfo::CanceledFailureInfo(
                             CanceledFailureInfo {
                                 details: details.map(Into::into),
+                                identity: Default::default(),
                             },
                         )),
                         ..Default::default()
@@ -1638,6 +1639,11 @@ pub mod temporal {
                 tonic::include_proto!("temporal.api.batch.v1");
             }
         }
+        pub mod callback {
+            pub mod v1 {
+                tonic::include_proto!("temporal.api.callback.v1");
+            }
+        }
         pub mod command {
             pub mod v1 {
                 tonic::include_proto!("temporal.api.command.v1");
@@ -2164,6 +2170,11 @@ pub mod temporal {
                 }
             }
         }
+        pub mod compute {
+            pub mod v1 {
+                tonic::include_proto!("temporal.api.compute.v1");
+            }
+        }
         pub mod deployment {
             pub mod v1 {
                 tonic::include_proto!("temporal.api.deployment.v1");
@@ -2398,6 +2409,8 @@ pub mod temporal {
                                 Attributes::WorkflowExecutionPausedEventAttributes(_) => true,
                                 // !! Ignorable !!
                                 Attributes::WorkflowExecutionUnpausedEventAttributes(_) => true,
+                                // !! Ignorable !!
+                                Attributes::WorkflowExecutionTimeSkippingTransitionedEventAttributes(_) => true,
                             }
                         } else {
                             false
@@ -2479,6 +2492,7 @@ pub mod temporal {
                             Attributes::NexusOperationCancelRequestFailedEventAttributes(_) => { EventType::NexusOperationCancelRequestFailed }
                             Attributes::WorkflowExecutionPausedEventAttributes(_) => { EventType::WorkflowExecutionPaused }
                             Attributes::WorkflowExecutionUnpausedEventAttributes(_) => { EventType::WorkflowExecutionUnpaused }
+                            Attributes::WorkflowExecutionTimeSkippingTransitionedEventAttributes(_) => { EventType::WorkflowExecutionTimeSkippingTransitioned }
                         }
                     }
                 }

crates/common/src/protos/mod.rs

@@ -3,21 +3,3 @@
 //! that will match the generated structs in this module.
 
 pub use temporalio_common_wasm::protos::*;
-
-#[cfg(feature = "test-utilities")]
-/// Pre-built test histories for common workflow patterns.
-pub mod canned_histories;
-#[cfg(feature = "history_builders")]
-mod history_builder;
-#[cfg(feature = "history_builders")]
-mod history_info;
-#[cfg(feature = "test-utilities")]
-pub mod test_utils;
-
-#[cfg(feature = "history_builders")]
-pub use history_builder::{
-    DEFAULT_ACTIVITY_TYPE, DEFAULT_WORKFLOW_TYPE, TestHistoryBuilder, default_act_sched,
-    default_wes_attribs,
-};
-#[cfg(feature = "history_builders")]
-pub use history_info::HistoryInfo;