Skip to content

Commit 7d0d2c6

Browse files
committed
[CRE] Fix pinned version TODO
1 parent 43a6f27 commit 7d0d2c6

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

core/services/workflows/v2/engine.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -455,16 +455,13 @@ func (e *Engine) runTriggerSubscriptionPhase(ctx context.Context) error {
455455
registrationID := TriggerRegistrationID(e.cfg.WorkflowID, i)
456456
e.logger().Debugw("Registering trigger", "triggerID", sub.Id, "method", sub.Method)
457457
metadata := capabilities.RequestMetadata{
458-
WorkflowID: e.cfg.WorkflowID,
459-
WorkflowOwner: e.cfg.WorkflowOwner,
460-
WorkflowName: e.cfg.WorkflowName.Hex(),
461-
WorkflowTag: e.cfg.WorkflowTag,
462-
DecodedWorkflowName: e.cfg.WorkflowName.String(),
463-
WorkflowDonID: e.localNode.Load().WorkflowDON.ID,
464-
// TODO(CRE-1636): This should be pinnedWorkflowDonConfigVersion, but it causes CI timeouts
465-
// that I can't reproduce locally. This values is unused in trigger subscription phase
466-
// so it's not a problem. Still, let's do it right when CI is fixed.
467-
WorkflowDonConfigVersion: e.localNode.Load().WorkflowDON.ConfigVersion,
458+
WorkflowID: e.cfg.WorkflowID,
459+
WorkflowOwner: e.cfg.WorkflowOwner,
460+
WorkflowName: e.cfg.WorkflowName.Hex(),
461+
WorkflowTag: e.cfg.WorkflowTag,
462+
DecodedWorkflowName: e.cfg.WorkflowName.String(),
463+
WorkflowDonID: e.localNode.Load().WorkflowDON.ID,
464+
WorkflowDonConfigVersion: pinnedWorkflowDonConfigVersion,
468465
ReferenceID: fmt.Sprintf("trigger_%d", i),
469466
WorkflowRegistryChainSelector: e.cfg.WorkflowRegistryChainSelector,
470467
WorkflowRegistryAddress: e.cfg.WorkflowRegistryAddress,

core/services/workflows/v2/engine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ func TestEngine_Execution(t *testing.T) {
607607
require.Equal(t, cfg.WorkflowName.Hex(), capturedTriggerRequest.Metadata.WorkflowName)
608608
require.Equal(t, cfg.WorkflowTag, capturedTriggerRequest.Metadata.WorkflowTag)
609609
require.Equal(t, uint32(0), capturedTriggerRequest.Metadata.WorkflowDonID)
610-
require.Equal(t, uint32(0), capturedTriggerRequest.Metadata.WorkflowDonConfigVersion)
610+
require.Equal(t, uint32(1), capturedTriggerRequest.Metadata.WorkflowDonConfigVersion)
611611
require.Equal(t, "trigger_0", capturedTriggerRequest.Metadata.ReferenceID)
612612
require.Equal(t, "method", capturedTriggerRequest.Method)
613613
require.Nil(t, capturedTriggerRequest.Payload)

0 commit comments

Comments
 (0)