rename helper function and remove generic

Author: chris-olszewski

packages/test/src/helpers.ts

@@ -105,7 +105,7 @@ export function cleanStackTrace(ostack: string): string {
  * to different stack traces depending on Node version.
  * See [f33e0fcc83954f728fcfd2ef6ae59435bc4af059](https://github.com/nodejs/node/commit/f33e0fcc83954f728fcfd2ef6ae59435bc4af059)
  */
-export function compareStackTraceIdentifiers<T>(t: ExecutionContext<T>, actual: string, expected: string): void {
+export function compareStackTrace(t: ExecutionContext, actual: string, expected: string): void {
   const escapedTrace = expected
     .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
     .replace(/-/g, '\\x2d')

packages/test/src/test-integration-split-one.ts

@@ -36,7 +36,7 @@ import {
 } from '@temporalio/workflow';
 import { configurableHelpers, createTestWorkflowBundle } from './helpers-integration';
 import * as activities from './activities';
-import { cleanOptionalStackTrace, compareStackTraceIdentifiers, u8, Worker } from './helpers';
+import { cleanOptionalStackTrace, compareStackTrace, u8, Worker } from './helpers';
 import { configMacro, makeTestFn } from './helpers-integration-multi-codec';
 import * as workflows from './workflows';
 
@@ -204,7 +204,7 @@ test.serial('activity-failure with ApplicationFailure', configMacro, async (t, c
   t.is(err.cause.cause.message, 'Fail me');
   t.is(err.cause.cause.type, 'Error');
   t.deepEqual(err.cause.cause.details, ['details', 123, false]);
-  compareStackTraceIdentifiers(
+  compareStackTrace(
     t,
     cleanOptionalStackTrace(err.cause.cause.stack)!,
     dedent`
@@ -259,7 +259,7 @@ test.serial('child-workflow-failure', configMacro, async (t, config) => {
       return t.fail('Expected err.cause.cause to be an instance of ApplicationFailure');
     }
     t.is(err.cause.cause.message, 'failure');
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       cleanOptionalStackTrace(err.cause.cause.stack)!,
       dedent`

packages/test/src/test-integration-split-three.ts

@@ -8,7 +8,7 @@ import { configMacro, makeTestFn } from './helpers-integration-multi-codec';
 import { configurableHelpers } from './helpers-integration';
 import { withZeroesHTTPServer } from './zeroes-http-server';
 import * as activities from './activities';
-import { approximatelyEqual, cleanOptionalStackTrace, compareStackTraceIdentifiers } from './helpers';
+import { approximatelyEqual, cleanOptionalStackTrace, compareStackTrace } from './helpers';
 import * as workflows from './workflows';
 
 const test = makeTestFn(() => bundleWorkflowCode({ workflowsPath: require.resolve('./workflows') }));
@@ -93,7 +93,7 @@ if ('promiseHooks' in v8) {
     {
       const functionName = stacks[0]!.locations[0]!.function_name!;
       delete stacks[0]!.locations[0]!.function_name;
-      compareStackTraceIdentifiers(t, functionName, '$CLASS.all');
+      compareStackTrace(t, functionName, '$CLASS.all');
     }
     t.deepEqual(stacks, [
       {

packages/test/src/test-interceptors.ts

@@ -12,7 +12,7 @@ import { WorkflowClient, WorkflowFailedError } from '@temporalio/client';
 import { ApplicationFailure, TerminatedFailure } from '@temporalio/common';
 import { DefaultLogger, Runtime } from '@temporalio/worker';
 import { defaultPayloadConverter, WorkflowInfo } from '@temporalio/workflow';
-import { cleanOptionalStackTrace, compareStackTraceIdentifiers, RUN_INTEGRATION_TESTS, Worker } from './helpers';
+import { cleanOptionalStackTrace, compareStackTrace, RUN_INTEGRATION_TESTS, Worker } from './helpers';
 import { defaultOptions } from './mock-native-worker';
 import {
   continueAsNewToDifferentWorkflow,
@@ -241,7 +241,7 @@ if (RUN_INTEGRATION_TESTS) {
       return;
     }
     t.deepEqual(err.cause.message, 'Expected anything other than 1');
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       cleanOptionalStackTrace(err.cause.stack)!,
       dedent`

packages/test/src/test-nexus-handler.ts

@@ -19,7 +19,7 @@ import {
   convertWorkflowEventLinkToNexusLink,
   convertNexusLinkToWorkflowEventLink,
 } from '@temporalio/nexus/lib/link-converter';
-import { cleanStackTrace, compareStackTraceIdentifiers, getRandomPort } from './helpers';
+import { cleanStackTrace, compareStackTrace, getRandomPort } from './helpers';
 
 export interface Context {
   httpPort: number;
@@ -314,7 +314,7 @@ test('start Operation Handler errors', async (t) => {
       });
       t.true(err instanceof ApplicationFailure);
       t.is(err.message, '');
-      compareStackTraceIdentifiers(
+      compareStackTrace(
         t,
         cleanStackTrace(err.stack!),
         `ApplicationFailure: deliberate failure
@@ -461,7 +461,7 @@ test('cancel Operation Handler errors', async (t) => {
       });
       t.true(err instanceof ApplicationFailure);
       t.is(err.message, '');
-      compareStackTraceIdentifiers(
+      compareStackTrace(
         t,
         cleanStackTrace(err.stack!),
         `ApplicationFailure: deliberate failure

packages/test/src/test-workflows.ts

@@ -22,7 +22,7 @@ import { SdkFlag, SdkFlags } from '@temporalio/workflow/lib/flags';
 import { ReusableVMWorkflow, ReusableVMWorkflowCreator } from '@temporalio/worker/lib/workflow/reusable-vm';
 import { parseWorkflowCode } from '@temporalio/worker/lib/worker';
 import * as activityFunctions from './activities';
-import { cleanStackTrace, compareStackTraceIdentifiers, REUSE_V8_CONTEXT, u8 } from './helpers';
+import { cleanStackTrace, compareStackTrace, REUSE_V8_CONTEXT, u8 } from './helpers';
 import { ProcessedSignal } from './workflows';
 
 export interface Context {
@@ -466,7 +466,7 @@ test('throwAsync', async (t) => {
   const req = cleanWorkflowFailureStackTrace(await activate(t, makeStartWorkflow(workflowType)));
   const actualStackTrace = removeWorkflowFailureStackTrace(req);
   compareCompletion(t, req, makeSuccess([makeFailWorkflowExecution('failure')]));
-  compareStackTraceIdentifiers(
+  compareStackTrace(
     t,
     actualStackTrace,
     dedent`
@@ -782,7 +782,7 @@ test('interruptableWorkflow', async (t) => {
         [SdkFlags.ProcessWorkflowActivationJobsAsSingleBatch]
       )
     );
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       stackTrace,
       // The stack trace is weird here and might confuse users, it might be a JS limitation
@@ -813,7 +813,7 @@ test('failSignalWorkflow', async (t) => {
         [SdkFlags.ProcessWorkflowActivationJobsAsSingleBatch]
       )
     );
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       stackTrace,
       dedent`
@@ -853,7 +853,7 @@ test('asyncFailSignalWorkflow', async (t) => {
         [SdkFlags.ProcessWorkflowActivationJobsAsSingleBatch]
       )
     );
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       stackTrace,
       dedent`
@@ -1467,7 +1467,7 @@ test('cancellationErrorIsPropagated', async (t) => {
       },
     ])
   );
-  compareStackTraceIdentifiers(
+  compareStackTrace(
     t,
     stackTrace,
     dedent`
@@ -1666,7 +1666,7 @@ test('resolve activity with failure - http', async (t) => {
     );
     const stackTrace = removeWorkflowFailureStackTrace(completion);
     compareCompletion(t, completion, makeSuccess([makeFailWorkflowExecution('Connection timeout', 'MockError')]));
-    compareStackTraceIdentifiers(t, stackTrace, 'ApplicationFailure: Connection timeout');
+    compareStackTrace(t, stackTrace, 'ApplicationFailure: Connection timeout');
   }
 });
 
@@ -1879,7 +1879,7 @@ test('tryToContinueAfterCompletion', async (t) => {
     const completion = cleanWorkflowFailureStackTrace(await activate(t, makeStartWorkflow(workflowType)));
     const stackTrace = removeWorkflowFailureStackTrace(completion);
     compareCompletion(t, completion, makeSuccess([makeFailWorkflowExecution('fail before continue')]));
-    compareStackTraceIdentifiers(
+    compareStackTrace(
       t,
       stackTrace,
       dedent`