Cleanup

Author: dandavison

service/history/chasm_engine.go

@@ -287,7 +287,7 @@ func (e *ChasmEngine) PollComponent(
 
 	// At this point it's possible that shard VT < requestRef VT (getExecutionLease does not
 	// guarantee that returned shard state is non-stale w.r.t. requestRef).
-	satisfiedRef, err := e.predicateSatisfied(ctx, requestRef, executionLease, monotonicPredicate)
+	satisfiedRef, err := e.predicateSatisfied(ctx, monotonicPredicate, requestRef, executionLease)
 	if err != nil {
 		return nil, err
 	}
@@ -330,7 +330,7 @@ func (e *ChasmEngine) PollComponent(
 			}
 			func() {
 				defer executionLease.GetReleaseFn()(nil)
-				satisfiedRef, err = e.predicateSatisfied(ctx, requestRef, executionLease, monotonicPredicate)
+				satisfiedRef, err = e.predicateSatisfied(ctx, monotonicPredicate, requestRef, executionLease)
 				if err == nil && satisfiedRef == nil {
 					ch = e.notifier.Subscribe(requestRef.EntityKey)
 				}
@@ -348,12 +348,12 @@ func (e *ChasmEngine) PollComponent(
 }
 
 // predicateSatisfied is a helper function for PollComponent. It returns (ref, err) where ref is non-nil
-// iff there's no error and predicateFn evaluates to true.
+// iff there's no error and predicate evaluates to true.
 func (e *ChasmEngine) predicateSatisfied(
 	ctx context.Context,
+	predicate func(chasm.Context, chasm.Component) (bool, error),
 	ref chasm.ComponentRef,
 	executionLease api.WorkflowLease,
-	predicateFn func(chasm.Context, chasm.Component) (bool, error),
 ) ([]byte, error) {
 	chasmTree, ok := executionLease.GetMutableState().ChasmTree().(*chasm.Node)
 	if !ok {
@@ -382,7 +382,7 @@ func (e *ChasmEngine) predicateSatisfied(
 	if err != nil {
 		return nil, err
 	}
-	satisfied, err := predicateFn(chasmContext, component)
+	satisfied, err := predicate(chasmContext, component)
 	if err != nil {
 		return nil, err
 	}