fix golangci lint

Author: feiyang3cat

service/history/historybuilder/history_builder.go

@@ -326,9 +326,9 @@ func (b *HistoryBuilder) AddWorkflowExecutionTimeSkippingTransitionedEvent(
 	targetTime time.Time,
 	triggeredDisable bool,
 ) *historypb.HistoryEvent {
-	event := b.EventFactory.CreateWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, triggeredDisable)
+	event := b.CreateWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, triggeredDisable)
 	event.WorkerMayIgnore = true
-	event, _ = b.EventStore.add(event)
+	event, _ = b.add(event)
 	b.metricsHandler.Counter(metrics.ExecutionTimeSkippingTransitionedCounter.Name()).Record(1)
 	return event
 }

service/history/workflow/mutable_state_impl.go

@@ -8446,18 +8446,19 @@ func (ms *MutableStateImpl) closeTransactionHandlerTimeSkipping(
 			return false
 		}
 		// TODO@time-skipping: need to support start-with-delay
-		if transactionPolicy == historyi.TransactionPolicyActive && ms.ShouldExecuteTimeSkipping() {
-			if _, err := ms.AddWorkflowExecutionTimeSkippingTransitionedEvent(ctx); err != nil {
+		if ms.ShouldExecuteTimeSkipping() {
+			_, err := ms.AddWorkflowExecutionTimeSkippingTransitionedEvent(ctx)
+			if err != nil {
 				ms.metricsHandler.Counter(metrics.ExecutionTimeSkippingTransitionedErrorCounter.Name()).Record(1)
 				ms.logger.Error(
 					"failed to add workflow execution time skipping transitioned event, and ignore this error and continue",
 					tag.WorkflowID(ms.GetExecutionInfo().WorkflowId),
 					tag.WorkflowRunID(ms.GetExecutionState().RunId),
 					tag.Error(err),
 				)
-			} else {
-				return true
+				return false
 			}
+			return true
 		}
 		return false
 	case historyi.TransactionPolicyPassive:

service/history/workflow/task_generator_test.go

@@ -1224,17 +1224,17 @@ func TestTaskGeneratorImpl_RegenerateTimerTasksForTimeSkipping(t *testing.T) {
 	// Timer 1: expiry now+1h, skipped 1h => visibility = now.
 	t1, ok := taskByEventID[1]
 	require.True(t, ok, "missing regenerated task for EventID=1")
-	assert.Equal(t, timer1ExpiryTime.Add(-skippedDuration), t1.VisibilityTimestamp)
-	assert.Equal(t, tests.WorkflowKey, t1.WorkflowKey)
+	require.Equal(t, timer1ExpiryTime.Add(-skippedDuration), t1.VisibilityTimestamp)
+	require.Equal(t, tests.WorkflowKey, t1.WorkflowKey)
 	// TaskID must be zero: the generator leaves it unset; the shard assigns the real ID.
-	assert.Equal(t, int64(0), t1.TaskID, "TaskID must be zero (set by shard, not the generator)")
+	require.Equal(t, int64(0), t1.TaskID, "TaskID must be zero (set by shard, not the generator)")
 
 	// Timer 2: expiry now+2h, skipped 1h => visibility = now+1h.
 	t2, ok := taskByEventID[2]
 	require.True(t, ok, "missing regenerated task for EventID=2")
-	assert.Equal(t, timer2ExpiryTime.Add(-skippedDuration), t2.VisibilityTimestamp)
-	assert.Equal(t, tests.WorkflowKey, t2.WorkflowKey)
-	assert.Equal(t, int64(0), t2.TaskID, "TaskID must be zero (set by shard, not the generator)")
+	require.Equal(t, timer2ExpiryTime.Add(-skippedDuration), t2.VisibilityTimestamp)
+	require.Equal(t, tests.WorkflowKey, t2.WorkflowKey)
+	require.Equal(t, int64(0), t2.TaskID, "TaskID must be zero (set by shard, not the generator)")
 }
 
 func TestTaskGeneratorImpl_RegenerateTimerTasksForTimeSkipping_EdgeCases(t *testing.T) {
@@ -1352,11 +1352,11 @@ func TestTaskGeneratorImpl_RegenerateTimerTasksForTimeSkipping_AccumulatedDurati
 	call2 := byEventID(allTasks[2:])
 
 	// First call used 10 min: visibility = expiry - 10 min.
-	assert.Equal(t, timer1ExpiryTime.Add(-10*time.Minute), call1[1].VisibilityTimestamp)
-	assert.Equal(t, timer2ExpiryTime.Add(-10*time.Minute), call1[2].VisibilityTimestamp)
+	require.Equal(t, timer1ExpiryTime.Add(-10*time.Minute), call1[1].VisibilityTimestamp)
+	require.Equal(t, timer2ExpiryTime.Add(-10*time.Minute), call1[2].VisibilityTimestamp)
 
 	// Second call used 20 min: visibility = expiry - 20 min, NOT expiry - 30 min.
 	// Each call reads AccumulatedSkippedDuration independently; the durations are not stacked.
-	assert.Equal(t, timer1ExpiryTime.Add(-20*time.Minute), call2[1].VisibilityTimestamp)
-	assert.Equal(t, timer2ExpiryTime.Add(-20*time.Minute), call2[2].VisibilityTimestamp)
+	require.Equal(t, timer1ExpiryTime.Add(-20*time.Minute), call2[1].VisibilityTimestamp)
+	require.Equal(t, timer2ExpiryTime.Add(-20*time.Minute), call2[2].VisibilityTimestamp)
 }

tests/timeskipping_test.go

@@ -419,6 +419,8 @@ func (s *TimeSkippingTestSuite) TestTimeSkipping_ActivityTimerActivityTimer() {
 			timerFiredCount++
 		case enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIME_SKIPPING_TRANSITIONED:
 			timeSkippingCount++
+		default:
+			// other event types are not relevant to this test
 		}
 	}
 	s.Equal(2, timerFiredCount, "both timers must fire via time-skipping")