@temporalio/core-bridge 0.17.2 → 0.18.0

package/sdk-core/{src → core/src/workflow}/machines/complete_workflow_state_machine.rs

@@ -1,4 +1,4 @@
-use crate::machines::{
+use super::{
     workflow_machines::MachineResponse, Cancellable, EventInfo, MachineKind, NewMachineWithCommand,
     OnEventWrapper, WFMachinesAdapter, WFMachinesError,
 };
@@ -34,13 +34,11 @@ pub(super) enum CompleteWFCommand {
 }
 
 /// Complete a workflow
-pub(super) fn complete_workflow(
-    attribs: CompleteWorkflowExecution,
-) -> NewMachineWithCommand<CompleteWorkflowMachine> {
+pub(super) fn complete_workflow(attribs: CompleteWorkflowExecution) -> NewMachineWithCommand {
     let (machine, add_cmd) = CompleteWorkflowMachine::new_scheduled(attribs);
     NewMachineWithCommand {
         command: add_cmd,
-        machine,
+        machine: machine.into(),
     }
 }
 

package/sdk-core/{src → core/src/workflow}/machines/continue_as_new_workflow_state_machine.rs

@@ -1,4 +1,4 @@
-use crate::machines::{
+use super::{
     Cancellable, EventInfo, HistoryEvent, MachineKind, MachineResponse, NewMachineWithCommand,
     OnEventWrapper, WFMachinesAdapter, WFMachinesError,
 };
@@ -29,9 +29,7 @@ fsm! {
 #[derive(Debug, derive_more::Display)]
 pub(super) enum ContinueAsNewWorkflowCommand {}
 
-pub(super) fn continue_as_new(
-    attribs: ContinueAsNewWorkflowExecution,
-) -> NewMachineWithCommand<ContinueAsNewWorkflowMachine> {
+pub(super) fn continue_as_new(attribs: ContinueAsNewWorkflowExecution) -> NewMachineWithCommand {
     let mut machine = ContinueAsNewWorkflowMachine {
         state: Created {}.into(),
         shared_state: (),
@@ -42,7 +40,10 @@ pub(super) fn continue_as_new(
         command_type: CommandType::ContinueAsNewWorkflowExecution as i32,
         attributes: Some(attribs.into()),
     };
-    NewMachineWithCommand { command, machine }
+    NewMachineWithCommand {
+        command,
+        machine: machine.into(),
+    }
 }
 
 #[derive(Default, Clone)]
@@ -120,19 +121,18 @@ impl Cancellable for ContinueAsNewWorkflowMachine {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        prototype_rust_sdk::{WfContext, WfExitValue, WorkflowFunction, WorkflowResult},
-        test_help::canned_histories,
-        workflow::managed_wf::ManagedWFFunc,
-    };
+    use crate::{test_help::canned_histories, workflow::managed_wf::ManagedWFFunc};
     use std::time::Duration;
+    use temporal_sdk::{WfContext, WfExitValue, WorkflowFunction, WorkflowResult};
 
-    async fn wf_with_timer(mut ctx: WfContext) -> WorkflowResult<()> {
+    async fn wf_with_timer(ctx: WfContext) -> WorkflowResult<()> {
         ctx.timer(Duration::from_millis(500)).await;
-        Ok(WfExitValue::ContinueAsNew(ContinueAsNewWorkflowExecution {
-            arguments: vec![[1].into()],
-            ..Default::default()
-        }))
+        Ok(WfExitValue::continue_as_new(
+            ContinueAsNewWorkflowExecution {
+                arguments: vec![[1].into()],
+                ..Default::default()
+            },
+        ))
     }
 
     #[tokio::test]
@@ -141,12 +141,12 @@ mod tests {
         let t = canned_histories::timer_then_continue_as_new("1");
         let mut wfm = ManagedWFFunc::new(t, func, vec![]);
         wfm.get_next_activation().await.unwrap();
-        let commands = wfm.get_server_commands().await.commands;
+        let commands = wfm.get_server_commands().commands;
         assert_eq!(commands.len(), 1);
         assert_eq!(commands[0].command_type, CommandType::StartTimer as i32);
 
         wfm.get_next_activation().await.unwrap();
-        let commands = wfm.get_server_commands().await.commands;
+        let commands = wfm.get_server_commands().commands;
         assert_eq!(commands.len(), 1);
         assert_eq!(
             commands[0].command_type,
@@ -154,7 +154,7 @@ mod tests {
         );
 
         assert!(wfm.get_next_activation().await.unwrap().jobs.is_empty());
-        let commands = wfm.get_server_commands().await.commands;
+        let commands = wfm.get_server_commands().commands;
         assert_eq!(commands.len(), 0);
         wfm.shutdown().await.unwrap();
     }

package/sdk-core/{src → core/src/workflow}/machines/fail_workflow_state_machine.rs

@@ -1,12 +1,13 @@
-use crate::machines::{
+use super::{
     workflow_machines::MachineResponse, Cancellable, EventInfo, MachineKind, NewMachineWithCommand,
-    OnEventWrapper, ProtoCommand, WFMachinesAdapter, WFMachinesError,
+    OnEventWrapper, WFMachinesAdapter, WFMachinesError,
 };
 use rustfsm::{fsm, TransitionResult};
 use std::convert::TryFrom;
 use temporal_sdk_core_protos::{
     coresdk::workflow_commands::FailWorkflowExecution,
     temporal::api::{
+        command::v1::Command as ProtoCommand,
         enums::v1::{CommandType, EventType},
         history::v1::HistoryEvent,
     },
@@ -30,13 +31,11 @@ pub(super) enum FailWFCommand {
 }
 
 /// Fail a workflow
-pub(super) fn fail_workflow(
-    attribs: FailWorkflowExecution,
-) -> NewMachineWithCommand<FailWorkflowMachine> {
+pub(super) fn fail_workflow(attribs: FailWorkflowExecution) -> NewMachineWithCommand {
     let (machine, add_cmd) = FailWorkflowMachine::new_scheduled(attribs);
     NewMachineWithCommand {
         command: add_cmd,
-        machine,
+        machine: machine.into(),
     }
 }