fix merge

Author: stephanos

chasm/lib/nexusoperation/operation.go

@@ -140,10 +140,6 @@ func (o *Operation) RequestCancel(
 	ctx chasm.MutableContext,
 	req *nexusoperationpb.CancellationState,
 ) error {
-	if !TransitionCanceled.Possible(o) {
-		return ErrOperationAlreadyCompleted
-	}
-
 	if existingCancellation, ok := o.Cancellation.TryGet(ctx); ok {
 		existingReqID := existingCancellation.GetRequestId()
 		newReqID := req.GetRequestId()
@@ -183,7 +179,7 @@ func (o *Operation) Terminate(
 		return chasm.TerminateComponentResponse{}, nil
 	}
 
-	return chasm.TerminateComponentResponse{}, TransitionTerminated.Apply(o, ctx, EventTerminated{TerminateComponentRequest: req})
+	return chasm.TerminateComponentResponse{}, TransitionTerminated.Apply(o, ctx, EventTerminated{req})
 }
 
 // SearchAttributes implements chasm.VisibilitySearchAttributesProvider interface.

chasm/lib/nexusoperation/operation_statemachine.go

@@ -213,7 +213,6 @@ var TransitionTerminated = chasm.NewTransition(
 		nexusoperationpb.OPERATION_STATUS_SCHEDULED,
 		nexusoperationpb.OPERATION_STATUS_STARTED,
 		nexusoperationpb.OPERATION_STATUS_BACKING_OFF,
-		nexusoperationpb.OPERATION_STATUS_CANCELED,
 	},
 	nexusoperationpb.OPERATION_STATUS_TERMINATED,
 	func(o *Operation, ctx chasm.MutableContext, event EventTerminated) error {