fix merge conflict

Author: chris-olszewski

crates/sdk-core/src/core_tests/workers.rs

@@ -15,14 +15,14 @@ use crate::{
     },
 };
 use futures_util::{stream, stream::StreamExt};
-use std::sync::{
-    Arc,
-    atomic::{AtomicBool, Ordering},
-};
-use std::{cell::RefCell, collections::HashMap, time::Duration};
-use temporalio_common::protos::temporal::api::{
-    namespace::v1::{NamespaceInfo, namespace_info::Capabilities},
-    workflowservice::v1::DescribeNamespaceResponse,
+use std::{
+    cell::RefCell,
+    collections::HashMap,
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    },
+    time::Duration,
 };
 use temporalio_common::{
     protos::{
@@ -41,6 +41,7 @@ use temporalio_common::{
                 ApplicationFailureInfo, CanceledFailureInfo, Failure, NexusHandlerFailureInfo,
                 TimeoutFailureInfo, failure::FailureInfo,
             },
+            namespace::v1::{NamespaceInfo, namespace_info::Capabilities},
             nexus::{
                 self,
                 v1::{
@@ -50,17 +51,17 @@ use temporalio_common::{
                 },
             },
             workflowservice::v1::{
-                PollActivityTaskQueueResponse, PollNexusTaskQueueResponse,
-                PollWorkflowTaskQueueResponse, RespondActivityTaskCompletedResponse,
-                RespondNexusTaskCompletedResponse, RespondNexusTaskFailedResponse,
-                RespondWorkflowTaskCompletedResponse, ShutdownWorkerResponse,
+                DescribeNamespaceResponse, PollActivityTaskQueueResponse,
+                PollNexusTaskQueueResponse, PollWorkflowTaskQueueResponse,
+                RespondActivityTaskCompletedResponse, RespondNexusTaskCompletedResponse,
+                RespondNexusTaskFailedResponse, RespondWorkflowTaskCompletedResponse,
+                ShutdownWorkerResponse,
             },
         },
     },
     worker::WorkerTaskTypes,
 };
-use tokio::sync::Notify;
-use tokio::sync::{Barrier, watch};
+use tokio::sync::{Barrier, Notify, watch};
 use uuid::Uuid;
 
 #[tokio::test]

crates/sdk-core/tests/integ_tests/workflow_tests/activities.rs

@@ -19,9 +19,7 @@ use temporalio_client::{
 
 use temporalio_common::{
     error::{ApplicationFailure, IncomingError},
-    prost_dur,
     protos::{
-        DEFAULT_ACTIVITY_TYPE, DEFAULT_WORKFLOW_TYPE, TestHistoryBuilder, canned_histories,
         coresdk::{
             ActivityHeartbeat, ActivityTaskCompletion, AsJsonPayloadExt, IntoCompletion,
             IntoPayloadsExt,
@@ -43,16 +41,6 @@ use temporalio_common::{
             failure::v1::{ActivityFailureInfo, Failure, failure::FailureInfo},
             sdk::v1::UserMetadata,
         },
-        workflow_commands::{
-            ActivityCancellationType, RequestCancelActivity, ScheduleActivity, StartTimer,
-        },
-        workflow_completion::WorkflowActivationCompletion,
-    },
-    temporal::api::{
-        common::v1::{ActivityType, Payload, Payloads, RetryPolicy},
-        enums::v1::{CommandType, EventType, RetryState},
-        failure::v1::{ActivityFailureInfo, Failure, failure::FailureInfo},
-        sdk::v1::UserMetadata,
     },
 };
 use temporalio_macros::{activities, workflow, workflow_methods};