Use type alias where possible

Author: cschleiden

workflow/activity.go

@@ -27,7 +27,7 @@ var DefaultActivityOptions = ActivityOptions{
 
 // ExecuteActivity schedules the given activity to be executed
 func ExecuteActivity[TResult any](ctx Context, options ActivityOptions, activity interface{}, args ...interface{}) Future[TResult] {
-	return WithRetries(ctx, options.RetryOptions, func(ctx sync.Context, attempt int) Future[TResult] {
+	return WithRetries(ctx, options.RetryOptions, func(ctx Context, attempt int) Future[TResult] {
 		return executeActivity[TResult](ctx, options, attempt, activity, args...)
 	})
 }
@@ -93,7 +93,7 @@ func executeActivity[TResult any](ctx Context, options ActivityOptions, attempt
 				if cmd.State() == command.CommandState_Pending {
 					cmd.Done()
 					wfState.RemoveFuture(scheduleEventID)
-					f.Set(*new(TResult), sync.Canceled)
+					f.Set(*new(TResult), Canceled)
 				}
 			}
 		}

workflow/activity_test.go

@@ -28,7 +28,7 @@ func Test_executeActivity_ResultMismatch(t *testing.T) {
 	)
 	ctx = workflowtracer.WithWorkflowTracer(ctx, workflowtracer.New(trace.NewNoopTracerProvider().Tracer("test")))
 
-	c := sync.NewCoroutine(ctx, func(ctx sync.Context) error {
+	c := sync.NewCoroutine(ctx, func(ctx Context) error {
 		f := executeActivity[string](ctx, DefaultActivityOptions, 1, a)
 		_, err := f.Get(ctx)
 		require.Error(t, err)
@@ -52,7 +52,7 @@ func Test_executeActivity_ParamMismatch(t *testing.T) {
 	)
 	ctx = workflowtracer.WithWorkflowTracer(ctx, workflowtracer.New(trace.NewNoopTracerProvider().Tracer("test")))
 
-	c := sync.NewCoroutine(ctx, func(ctx sync.Context) error {
+	c := sync.NewCoroutine(ctx, func(ctx Context) error {
 		f := executeActivity[int](ctx, DefaultActivityOptions, 1, a)
 		_, err := f.Get(ctx)
 		require.Error(t, err)

workflow/instance.go

@@ -1,11 +1,10 @@
 package workflow
 
 import (
-	"github.com/cschleiden/go-workflows/internal/sync"
 	"github.com/cschleiden/go-workflows/internal/workflowstate"
 )
 
-func WorkflowInstance(ctx sync.Context) *Instance {
+func WorkflowInstance(ctx Context) *Instance {
 	wfState := workflowstate.WorkflowState(ctx)
 	return wfState.Instance()
 }

workflow/now.go

@@ -3,11 +3,10 @@ package workflow
 import (
 	"time"
 
-	"github.com/cschleiden/go-workflows/internal/sync"
 	"github.com/cschleiden/go-workflows/internal/workflowstate"
 )
 
-func Now(ctx sync.Context) time.Time {
+func Now(ctx Context) time.Time {
 	wfState := workflowstate.WorkflowState(ctx)
 	return wfState.Time()
 }

workflow/retries.go

@@ -44,7 +44,7 @@ func WithRetries[T any](ctx Context, retryOptions RetryOptions, fn func(ctx Cont
 	// Start a separate co-routine for retries
 	r := sync.NewFuture[T]()
 
-	Go(ctx, func(ctx sync.Context) {
+	Go(ctx, func(ctx Context) {
 		var result T
 		var err error
 

workflow/sleep.go

@@ -3,14 +3,13 @@ package workflow
 import (
 	"time"
 
-	"github.com/cschleiden/go-workflows/internal/sync"
 	"github.com/cschleiden/go-workflows/internal/workflowtracer"
 	"github.com/cschleiden/go-workflows/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
 
-func Sleep(ctx sync.Context, d time.Duration) error {
+func Sleep(ctx Context, d time.Duration) error {
 	ctx, span := workflowtracer.Tracer(ctx).Start(ctx, "Sleep",
 		trace.WithAttributes(attribute.Int64(log.DurationKey, int64(d/time.Millisecond))))
 	defer span.End()

workflow/sleep_test.go

@@ -11,7 +11,7 @@ import (
 func Test_Sleep_Yields(t *testing.T) {
 	ctx := sync.Background()
 
-	c := sync.NewCoroutine(ctx, func(ctx sync.Context) error {
+	c := sync.NewCoroutine(ctx, func(ctx Context) error {
 		Sleep(ctx, 2*time.Millisecond)
 		require.FailNow(t, "should not reach this")
 

workflow/subworkflow.go

@@ -34,13 +34,13 @@ var (
 	}
 )
 
-func CreateSubWorkflowInstance[TResult any](ctx sync.Context, options SubWorkflowOptions, workflow interface{}, args ...interface{}) Future[TResult] {
-	return WithRetries(ctx, options.RetryOptions, func(ctx sync.Context, attempt int) Future[TResult] {
+func CreateSubWorkflowInstance[TResult any](ctx Context, options SubWorkflowOptions, workflow interface{}, args ...interface{}) Future[TResult] {
+	return WithRetries(ctx, options.RetryOptions, func(ctx Context, attempt int) Future[TResult] {
 		return createSubWorkflowInstance[TResult](ctx, options, attempt, workflow, args...)
 	})
 }
 
-func createSubWorkflowInstance[TResult any](ctx sync.Context, options SubWorkflowOptions, attempt int, wf interface{}, args ...interface{}) Future[TResult] {
+func createSubWorkflowInstance[TResult any](ctx Context, options SubWorkflowOptions, attempt int, wf interface{}, args ...interface{}) Future[TResult] {
 	f := sync.NewFuture[TResult]()
 
 	// If the context is already canceled, return immediately.
@@ -105,7 +105,7 @@ func createSubWorkflowInstance[TResult any](ctx sync.Context, options SubWorkflo
 					if fi, ok := f.(sync.FutureInternal[TResult]); ok {
 						if !fi.Ready() {
 							wfState.RemoveFuture(scheduleEventID)
-							f.Set(*new(TResult), sync.Canceled)
+							f.Set(*new(TResult), Canceled)
 						}
 					}
 				}

workflow/subworkflow_test.go

@@ -28,7 +28,7 @@ func Test_createSubWorkflowInstance_ParamMismatch(t *testing.T) {
 	)
 	ctx = workflowtracer.WithWorkflowTracer(ctx, workflowtracer.New(trace.NewNoopTracerProvider().Tracer("test")))
 
-	c := sync.NewCoroutine(ctx, func(ctx sync.Context) error {
+	c := sync.NewCoroutine(ctx, func(ctx Context) error {
 		f := createSubWorkflowInstance[int](ctx, DefaultSubWorkflowOptions, 1, wf, "foo")
 		_, err := f.Get(ctx)
 		require.Error(t, err)
@@ -53,7 +53,7 @@ func Test_createSubWorkflowInstance_ReturnMismatch(t *testing.T) {
 	)
 	ctx = workflowtracer.WithWorkflowTracer(ctx, workflowtracer.New(trace.NewNoopTracerProvider().Tracer("test")))
 
-	c := sync.NewCoroutine(ctx, func(ctx sync.Context) error {
+	c := sync.NewCoroutine(ctx, func(ctx Context) error {
 		f := createSubWorkflowInstance[string](ctx, DefaultSubWorkflowOptions, 1, wf)
 		_, err := f.Get(ctx)
 		require.Error(t, err)

workflow/timer.go

@@ -41,7 +41,7 @@ func ScheduleTimer(ctx Context, delay time.Duration) Future[struct{}] {
 			if fi, ok := f.(sync.FutureInternal[struct{}]); ok {
 				if !fi.Ready() {
 					wfState.RemoveFuture(scheduleEventID)
-					f.Set(v, sync.Canceled)
+					f.Set(v, Canceled)
 				}
 			}
 		},