@temporalio/core-bridge 1.5.2 → 1.7.0

package/sdk-core/test-utils/src/canned_histories.rs

@@ -24,7 +24,7 @@ pub fn single_timer(timer_id: &str) -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, timer_id.to_string());
     t.add_workflow_task_scheduled_and_started();
     t
@@ -53,20 +53,19 @@ pub fn cancel_timer(wait_timer_id: &str, cancel_timer_id: &str) -> TestHistoryBu
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let cancel_timer_started_id = t.add_get_event_id(EventType::TimerStarted, None);
-    let wait_timer_started_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let cancel_timer_started_id = t.add_by_type(EventType::TimerStarted);
+    let wait_timer_started_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(wait_timer_started_id, wait_timer_id.to_string());
     // 8
     t.add_full_wf_task();
     // 11
-    t.add(
-        EventType::TimerCanceled,
-        history_event::Attributes::TimerCanceledEventAttributes(TimerCanceledEventAttributes {
+    t.add(history_event::Attributes::TimerCanceledEventAttributes(
+        TimerCanceledEventAttributes {
             started_event_id: cancel_timer_started_id,
             timer_id: cancel_timer_id.to_string(),
             ..Default::default()
-        }),
-    );
+        },
+    ));
     // 12
     t.add_workflow_execution_completed();
     t
@@ -86,8 +85,8 @@ pub fn parallel_timer(timer1: &str, timer2: &str) -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
-    let timer_2_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
+    let timer_2_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, timer1.to_string());
     t.add_timer_fired(timer_2_started_event_id, timer2.to_string());
     t.add_workflow_task_scheduled_and_started();
@@ -173,7 +172,7 @@ pub fn workflow_fails_with_failure_two_different_points(
         },
     );
     t.add_full_wf_task();
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, timer_2.to_string());
     t.add_workflow_task_scheduled_and_started();
     t.add_workflow_task_failed_with_failure(
@@ -208,6 +207,22 @@ pub fn single_activity(activity_id: &str) -> TestHistoryBuilder {
     t
 }
 
+///  1: EVENT_TYPE_WORKFLOW_EXECUTION_STARTED
+///  2: EVENT_TYPE_WORKFLOW_TASK_SCHEDULED
+///  3: EVENT_TYPE_WORKFLOW_TASK_STARTED
+///  4: EVENT_TYPE_WORKFLOW_TASK_COMPLETED
+///  5: EVENT_TYPE_MARKER_RECORDED
+///  6: EVENT_TYPE_WORKFLOW_TASK_SCHEDULED
+///  7: EVENT_TYPE_WORKFLOW_TASK_STARTED
+pub fn single_local_activity(activity_id: &str) -> TestHistoryBuilder {
+    let mut t = TestHistoryBuilder::default();
+    t.add_by_type(EventType::WorkflowExecutionStarted);
+    t.add_full_wf_task();
+    t.add_local_activity_result_marker(1, activity_id, Default::default());
+    t.add_workflow_task_scheduled_and_started();
+    t
+}
+
 ///  1: EVENT_TYPE_WORKFLOW_EXECUTION_STARTED
 ///  2: EVENT_TYPE_WORKFLOW_TASK_SCHEDULED
 ///  3: EVENT_TYPE_WORKFLOW_TASK_STARTED
@@ -224,7 +239,6 @@ pub fn single_failed_activity(activity_id: &str) -> TestHistoryBuilder {
     let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
     let started_event_id = t.add_activity_task_started(scheduled_event_id);
     t.add(
-        EventType::ActivityTaskFailed,
         history_event::Attributes::ActivityTaskFailedEventAttributes(
             ActivityTaskFailedEventAttributes {
                 scheduled_event_id,
@@ -262,7 +276,6 @@ pub fn cancel_scheduled_activity(activity_id: &str, signal_id: &str) -> TestHist
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -290,7 +303,6 @@ pub fn scheduled_activity_timeout(activity_id: &str) -> TestHistoryBuilder {
     t.add_full_wf_task();
     let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
     t.add(
-        EventType::ActivityTaskTimedOut,
         history_event::Attributes::ActivityTaskTimedOutEventAttributes(
             ActivityTaskTimedOutEventAttributes {
                 scheduled_event_id,
@@ -335,7 +347,6 @@ pub fn scheduled_cancelled_activity_timeout(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -344,7 +355,6 @@ pub fn scheduled_cancelled_activity_timeout(
         ),
     );
     t.add(
-        EventType::ActivityTaskTimedOut,
         history_event::Attributes::ActivityTaskTimedOutEventAttributes(
             ActivityTaskTimedOutEventAttributes {
                 scheduled_event_id,
@@ -372,30 +382,12 @@ pub fn started_activity_timeout(activity_id: &str) -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    let started_event_id = t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
+    let started_event_id = t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
     t.add(
-        EventType::ActivityTaskTimedOut,
         history_event::Attributes::ActivityTaskTimedOutEventAttributes(
             ActivityTaskTimedOutEventAttributes {
                 scheduled_event_id,
@@ -423,17 +415,7 @@ pub fn cancel_scheduled_activity_abandon(activity_id: &str, signal_id: &str) ->
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    t.add_activity_task_scheduled(activity_id);
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -461,28 +443,11 @@ pub fn cancel_started_activity_abandon(activity_id: &str, signal_id: &str) -> Te
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
+    t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -521,17 +486,7 @@ pub fn cancel_scheduled_activity_with_signal_and_activity_task_cancel(
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -541,7 +496,6 @@ pub fn cancel_scheduled_activity_with_signal_and_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -558,7 +512,6 @@ pub fn cancel_scheduled_activity_with_signal_and_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCanceled,
         history_event::Attributes::ActivityTaskCanceledEventAttributes(
             ActivityTaskCanceledEventAttributes {
                 scheduled_event_id,
@@ -598,28 +551,11 @@ pub fn cancel_started_activity_with_signal_and_activity_task_cancel(
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
+    t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -629,7 +565,6 @@ pub fn cancel_started_activity_with_signal_and_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -646,7 +581,6 @@ pub fn cancel_started_activity_with_signal_and_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCanceled,
         history_event::Attributes::ActivityTaskCanceledEventAttributes(
             ActivityTaskCanceledEventAttributes {
                 scheduled_event_id,
@@ -681,17 +615,7 @@ pub fn cancel_scheduled_activity_with_activity_task_cancel(
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -701,7 +625,6 @@ pub fn cancel_scheduled_activity_with_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -710,7 +633,6 @@ pub fn cancel_scheduled_activity_with_activity_task_cancel(
         ),
     );
     t.add(
-        EventType::ActivityTaskCanceled,
         history_event::Attributes::ActivityTaskCanceledEventAttributes(
             ActivityTaskCanceledEventAttributes {
                 scheduled_event_id,
@@ -746,28 +668,11 @@ pub fn cancel_started_activity_with_activity_task_cancel(
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: activity_id.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled(activity_id);
+    t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
     t.add_we_signaled(
         signal_id,
         vec![Payload {
@@ -777,7 +682,6 @@ pub fn cancel_started_activity_with_activity_task_cancel(
     );
     t.add_full_wf_task();
     t.add(
-        EventType::ActivityTaskCancelRequested,
         history_event::Attributes::ActivityTaskCancelRequestedEventAttributes(
             ActivityTaskCancelRequestedEventAttributes {
                 scheduled_event_id,
@@ -786,7 +690,6 @@ pub fn cancel_started_activity_with_activity_task_cancel(
         ),
     );
     t.add(
-        EventType::ActivityTaskCanceled,
         history_event::Attributes::ActivityTaskCanceledEventAttributes(
             ActivityTaskCanceledEventAttributes {
                 scheduled_event_id,
@@ -849,7 +752,7 @@ pub fn long_sequential_timers(num_tasks: usize) -> TestHistoryBuilder {
     t.add_full_wf_task();
 
     for i in 1..=num_tasks {
-        let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+        let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
         t.add_timer_fired(timer_started_event_id, i.to_string());
         t.add_full_wf_task();
     }
@@ -903,23 +806,13 @@ pub fn unsent_at_cancel_repro() -> TestHistoryBuilder {
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
 
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: 1.to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let scheduled_event_id = t.add_activity_task_scheduled(1.to_string());
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, 1.to_string());
 
     t.add_full_wf_task();
     t.add_activity_task_cancel_requested(scheduled_event_id);
-    t.add_get_event_id(EventType::TimerStarted, None);
+    t.add_by_type(EventType::TimerStarted);
     t.add_workflow_task_scheduled_and_started();
 
     t
@@ -947,17 +840,7 @@ pub fn cancel_not_sent_when_also_complete_repro() -> TestHistoryBuilder {
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
 
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: "act-1".to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled("act-1");
     t.add_we_signaled(
         "sig-1",
         vec![Payload {
@@ -967,20 +850,12 @@ pub fn cancel_not_sent_when_also_complete_repro() -> TestHistoryBuilder {
     );
     t.add_full_wf_task();
     t.add_activity_task_cancel_requested(scheduled_event_id);
-    t.add_get_event_id(EventType::TimerStarted, None);
-    let started_event_id = t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    t.add_by_type(EventType::TimerStarted);
+    let started_event_id = t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
     t.add(
-        EventType::ActivityTaskCompleted,
         history_event::Attributes::ActivityTaskCompletedEventAttributes(
             ActivityTaskCompletedEventAttributes {
                 scheduled_event_id,
@@ -1015,17 +890,7 @@ pub fn wft_timeout_repro() -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let scheduled_event_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: "act-1".to_string(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let scheduled_event_id = t.add_activity_task_scheduled("1");
     t.add_we_signaled(
         "at-started",
         vec![Payload {
@@ -1041,27 +906,15 @@ pub fn wft_timeout_repro() -> TestHistoryBuilder {
             data: b"hello ".to_vec(),
         }],
     );
-    let started_event_id = t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    t.add(
-        EventType::ActivityTaskCompleted,
-        history_event::Attributes::ActivityTaskCompletedEventAttributes(
-            ActivityTaskCompletedEventAttributes {
-                scheduled_event_id,
-                started_event_id,
-                ..Default::default()
-            },
-        ),
-    );
+    let started_event_id = t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id,
+        ..Default::default()
+    });
+    t.add(ActivityTaskCompletedEventAttributes {
+        scheduled_event_id,
+        started_event_id,
+        ..Default::default()
+    });
     t.add_workflow_task_started();
     t.add_workflow_task_timed_out();
     t.add_full_wf_task();
@@ -1084,7 +937,7 @@ pub fn timer_then_continue_as_new(timer_id: &str) -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, timer_id.to_string());
     t.add_full_wf_task();
     t.add_continued_as_new();
@@ -1133,7 +986,7 @@ pub fn timer_wf_cancel_req_failed(timer_id: &str) -> TestHistoryBuilder {
 /// 16: EVENT_TYPE_WORKFLOW_EXECUTION_CANCELED
 pub fn timer_wf_cancel_req_do_another_timer_then_cancelled() -> TestHistoryBuilder {
     timer_cancel_req_then("1", |t| {
-        let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+        let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
         t.add_timer_fired(timer_started_event_id, "2".to_string());
         t.add_full_wf_task();
         t.add_cancelled();
@@ -1158,7 +1011,7 @@ fn timer_cancel_req_then(
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, timer_id.to_string());
     t.add_cancel_requested();
     t.add_full_wf_task();
@@ -1207,34 +1060,23 @@ pub fn activity_double_resolve_repro() -> TestHistoryBuilder {
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let act_sched_id = t.add_get_event_id(
-        EventType::ActivityTaskScheduled,
-        Some(
-            history_event::Attributes::ActivityTaskScheduledEventAttributes(
-                ActivityTaskScheduledEventAttributes {
-                    activity_id: "1".to_string(),
-                    ..Default::default()
-                },
-            ),
+    let act_sched_id = t.add(
+        history_event::Attributes::ActivityTaskScheduledEventAttributes(
+            ActivityTaskScheduledEventAttributes {
+                activity_id: "1".to_string(),
+                ..Default::default()
+            },
         ),
     );
     t.add_we_signaled("sig1", vec![]);
     t.add_full_wf_task();
     t.add_activity_task_cancel_requested(act_sched_id);
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
-    t.add_get_event_id(
-        EventType::ActivityTaskStarted,
-        Some(
-            history_event::Attributes::ActivityTaskStartedEventAttributes(
-                ActivityTaskStartedEventAttributes {
-                    scheduled_event_id: act_sched_id,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
+    t.add(ActivityTaskStartedEventAttributes {
+        scheduled_event_id: act_sched_id,
+        ..Default::default()
+    });
     t.add(
-        EventType::ActivityTaskTimedOut,
         history_event::Attributes::ActivityTaskTimedOutEventAttributes(
             ActivityTaskTimedOutEventAttributes {
                 scheduled_event_id: act_sched_id,
@@ -1266,32 +1108,18 @@ fn start_child_wf_preamble(child_wf_id: &str) -> (TestHistoryBuilder, i64, i64)
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let initiated_event_id = t.add_get_event_id(
-        EventType::StartChildWorkflowExecutionInitiated,
-        Some(
-            history_event::Attributes::StartChildWorkflowExecutionInitiatedEventAttributes(
-                StartChildWorkflowExecutionInitiatedEventAttributes {
-                    workflow_id: child_wf_id.to_owned(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    let started_event_id = t.add_get_event_id(
-        EventType::ChildWorkflowExecutionStarted,
-        Some(
-            history_event::Attributes::ChildWorkflowExecutionStartedEventAttributes(
-                ChildWorkflowExecutionStartedEventAttributes {
-                    initiated_event_id,
-                    workflow_execution: Some(WorkflowExecution {
-                        workflow_id: child_wf_id.to_owned(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let initiated_event_id = t.add(StartChildWorkflowExecutionInitiatedEventAttributes {
+        workflow_id: child_wf_id.to_owned(),
+        ..Default::default()
+    });
+    let started_event_id = t.add(ChildWorkflowExecutionStartedEventAttributes {
+        initiated_event_id,
+        workflow_execution: Some(WorkflowExecution {
+            workflow_id: child_wf_id.to_owned(),
+            ..Default::default()
+        }),
+        ..Default::default()
+    });
     t.add_full_wf_task();
     (t, initiated_event_id, started_event_id)
 }
@@ -1313,7 +1141,6 @@ fn start_child_wf_preamble(child_wf_id: &str) -> (TestHistoryBuilder, i64, i64)
 pub fn single_child_workflow(child_wf_id: &str) -> TestHistoryBuilder {
     let (mut t, initiated_event_id, started_event_id) = start_child_wf_preamble(child_wf_id);
     t.add(
-        EventType::ChildWorkflowExecutionCompleted,
         history_event::Attributes::ChildWorkflowExecutionCompletedEventAttributes(
             ChildWorkflowExecutionCompletedEventAttributes {
                 initiated_event_id,
@@ -1345,7 +1172,6 @@ pub fn single_child_workflow(child_wf_id: &str) -> TestHistoryBuilder {
 pub fn single_child_workflow_fail(child_wf_id: &str) -> TestHistoryBuilder {
     let (mut t, initiated_event_id, started_event_id) = start_child_wf_preamble(child_wf_id);
     t.add(
-        EventType::ChildWorkflowExecutionFailed,
         history_event::Attributes::ChildWorkflowExecutionFailedEventAttributes(
             ChildWorkflowExecutionFailedEventAttributes {
                 initiated_event_id,
@@ -1380,7 +1206,6 @@ pub fn single_child_workflow_signaled(child_wf_id: &str, signame: &str) -> TestH
     let id = t.add_signal_wf(signame, "fake_wid", "fake_rid");
     t.add_external_signal_completed(id);
     t.add(
-        EventType::ChildWorkflowExecutionCompleted,
         history_event::Attributes::ChildWorkflowExecutionCompletedEventAttributes(
             ChildWorkflowExecutionCompletedEventAttributes {
                 initiated_event_id,
@@ -1418,7 +1243,6 @@ pub fn single_child_workflow_cancelled(child_wf_id: &str) -> TestHistoryBuilder
     });
     t.add_cancel_external_wf_completed(id);
     t.add(
-        EventType::ChildWorkflowExecutionCanceled,
         history_event::Attributes::ChildWorkflowExecutionCanceledEventAttributes(
             ChildWorkflowExecutionCanceledEventAttributes {
                 initiated_event_id,
@@ -1489,30 +1313,16 @@ pub fn single_child_workflow_start_fail(child_wf_id: &str) -> TestHistoryBuilder
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let initiated_event_id = t.add_get_event_id(
-        EventType::StartChildWorkflowExecutionInitiated,
-        Some(
-            history_event::Attributes::StartChildWorkflowExecutionInitiatedEventAttributes(
-                StartChildWorkflowExecutionInitiatedEventAttributes {
-                    workflow_id: child_wf_id.to_owned(),
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
-    t.add_get_event_id(
-        EventType::StartChildWorkflowExecutionFailed,
-        Some(
-            history_event::Attributes::StartChildWorkflowExecutionFailedEventAttributes(
-                StartChildWorkflowExecutionFailedEventAttributes {
-                    workflow_id: child_wf_id.to_owned(),
-                    initiated_event_id,
-                    cause: StartChildWorkflowExecutionFailedCause::WorkflowAlreadyExists as i32,
-                    ..Default::default()
-                },
-            ),
-        ),
-    );
+    let initiated_event_id = t.add(StartChildWorkflowExecutionInitiatedEventAttributes {
+        workflow_id: child_wf_id.to_owned(),
+        ..Default::default()
+    });
+    t.add(StartChildWorkflowExecutionFailedEventAttributes {
+        workflow_id: child_wf_id.to_owned(),
+        initiated_event_id,
+        cause: StartChildWorkflowExecutionFailedCause::WorkflowAlreadyExists as i32,
+        ..Default::default()
+    });
     t.add_full_wf_task();
     t.add_workflow_execution_completed();
     t
@@ -1557,7 +1367,7 @@ pub fn two_local_activities_separated_by_timer() -> TestHistoryBuilder {
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
     t.add_local_activity_result_marker(1, "1", b"hi".into());
-    let timer_started_event_id = t.add_get_event_id(EventType::TimerStarted, None);
+    let timer_started_event_id = t.add_by_type(EventType::TimerStarted);
     t.add_timer_fired(timer_started_event_id, "1".to_string());
     t.add_full_wf_task();
     t.add_local_activity_result_marker(2, "2", b"hi2".into());