[Keystone] Bugfix: Error comparison; Adjust schedule in sample OCR co…

…nfig (#13532)
smartcontractkit · Jun 12, 2024 · e588450 · e588450
1 parent 2db7369
commit e588450
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/scripts/keystone/ocr_config.json b/core/scripts/keystone/ocr_config.json
@@ -14,7 +14,7 @@
     "DeltaCertifiedCommitRequestMillis": 1000,
     "DeltaStageMillis": 30000,
     "MaxRoundsPerEpoch": 10,
-    "TransmissionSchedule": [4],
+    "TransmissionSchedule": [7],
 
     "MaxDurationQueryMillis": 1000,
     "MaxDurationObservationMillis": 1000,

diff --git a/core/services/workflows/engine.go b/core/services/workflows/engine.go
@@ -582,7 +582,7 @@ func (e *Engine) workerForStepRequest(ctx context.Context, msg stepRequest) {
 	inputs, outputs, err := e.executeStep(ctx, l, msg)
 	var stepStatus string
 	switch {
-	case errors.Is(err, capabilities.ErrStopExecution):
+	case errors.Is(capabilities.ErrStopExecution, err):
 		l.Infow("step executed successfully with a termination")
 		stepStatus = store.StatusCompletedEarlyExit
 	case err != nil:

diff --git a/core/services/workflows/engine_test.go b/core/services/workflows/engine_test.go
@@ -329,7 +329,8 @@ func mockConsensusWithEarlyTermination() *mockCapability {
 		),
 		func(req capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 			return capabilities.CapabilityResponse{
-				Err: capabilities.ErrStopExecution,
+				// copy error object to make sure message comparison works as expected
+				Err: errors.New(capabilities.ErrStopExecution.Error()),
 			}, nil
 		},
 	)