-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into BCF-3139-chreader-lp-filter-config
- Loading branch information
Showing
24 changed files
with
256 additions
and
293 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": minor | ||
| --- | ||
|
|
||
| #internal moves workflow name and owner to the yaml spec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,37 @@ | ||
| <!--- Does this work have a corresponding ticket? --> | ||
| ## Ticket | ||
| <!--- | ||
| Does this work have a corresponding ticket? | ||
| https://smartcontract-it.atlassian.net/browse/... | ||
| Please link your Jira ticket by including it in one of the following reference: | ||
| - the PR title | ||
| - branch name | ||
| - commit message | ||
| By referencing it, it will let the QA team to know what to watch out for when creating a new release. | ||
| <!--- Does this work depend on other open PRs? --> | ||
| Example: | ||
| Requires: | ||
| - https://github.com/smartcontractkit/chainlink-common/pull/123456 | ||
| [LINK-777](https://smartcontract-it.atlassian.net/browse/LINK-777) | ||
| --> | ||
|
|
||
| <!--- Does this work support other open PRs? --> | ||
| ## Requires Dependencies | ||
| <!--- | ||
| Does this work depend on other open PRs? | ||
| Supports: | ||
| - https://github.com/smartcontractkit/ccip/pull/456789 | ||
| Please list other PRs that are blocking this PR. | ||
| Example: | ||
| - https://github.com/smartcontractkit/chainlink-common/pull/7777777 | ||
| --> | ||
|
|
||
| ## Resolves Dependencies | ||
| <!--- | ||
| Does this work support other open PRs? | ||
| Please list other PRs that are waiting for this PR to be merged. | ||
| Example: | ||
| - https://github.com/smartcontractkit/ccip/pull/7777777 | ||
| --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -652,45 +652,15 @@ func Test_Service_ProposeJob(t *testing.T) { | |
| httpTimeout = *commonconfig.MustNewDuration(1 * time.Second) | ||
|
|
||
| // variables for workflow spec | ||
| wfID = "15c631d295ef5e32deb99a10ee6804bc4af1385568f9b3363f6552ac6dbb2cef" | ||
| wfOwner = "00000000000000000000000000000000000000aa" | ||
| wfName = "myworkflow" // len 10 | ||
| specYaml = ` | ||
| triggers: | ||
| - id: "[email protected]" | ||
| config: {} | ||
| actions: | ||
| - id: "[email protected]" | ||
| ref: "an-action" | ||
| config: {} | ||
| inputs: | ||
| trigger_output: $(trigger.outputs) | ||
| consensus: | ||
| - id: "[email protected]" | ||
| ref: "a-consensus" | ||
| config: {} | ||
| inputs: | ||
| trigger_output: $(trigger.outputs) | ||
| an-action_output: $(an-action.outputs) | ||
| targets: | ||
| - id: "[email protected]" | ||
| config: {} | ||
| ref: "a-target" | ||
| inputs: | ||
| consensus_output: $(a-consensus.outputs) | ||
| ` | ||
| wfSpec = testspecs.GenerateWorkflowSpec(wfID, wfOwner, wfName, specYaml).Toml() | ||
| wfJobSpec = testspecs.DefaultWorkflowJobSpec(t) | ||
| proposalIDWF = int64(11) | ||
| jobProposalSpecIdWF = int64(101) | ||
| jobIDWF = int32(1001) | ||
| remoteUUIDWF = uuid.New() | ||
| argsWF = &feeds.ProposeJobArgs{ | ||
| FeedsManagerID: 1, | ||
| RemoteUUID: remoteUUIDWF, | ||
| Spec: wfSpec, | ||
| Spec: wfJobSpec.Toml(), | ||
| Version: 1, | ||
| } | ||
| jpWF = feeds.JobProposal{ | ||
|
|
@@ -707,14 +677,14 @@ targets: | |
| Status: feeds.JobProposalStatusPending, | ||
| } | ||
| proposalSpecWF = feeds.JobProposalSpec{ | ||
| Definition: wfSpec, | ||
| Definition: wfJobSpec.Toml(), | ||
| Status: feeds.SpecStatusPending, | ||
| Version: 1, | ||
| JobProposalID: proposalIDWF, | ||
| } | ||
| autoApprovableProposalSpecWF = feeds.JobProposalSpec{ | ||
| ID: jobProposalSpecIdWF, | ||
| Definition: wfSpec, | ||
| Definition: wfJobSpec.Toml(), | ||
| Status: feeds.SpecStatusPending, | ||
| Version: 1, | ||
| JobProposalID: proposalIDWF, | ||
|
|
@@ -755,7 +725,11 @@ targets: | |
| mock.Anything, | ||
| mock.Anything, | ||
| mock.MatchedBy(func(j *job.Job) bool { | ||
| return j.WorkflowSpec.WorkflowOwner == wfOwner | ||
| match := j.WorkflowSpec.Workflow == wfJobSpec.Job().WorkflowSpec.Workflow | ||
| if !match { | ||
| t.Logf("got wf spec %s want %s", j.WorkflowSpec.Workflow, wfJobSpec.Job().WorkflowSpec.Workflow) | ||
| } | ||
| return match | ||
| }), | ||
| ). | ||
| Run(func(args mock.Arguments) { (args.Get(2).(*job.Job)).ID = 1 }). | ||
|
|
@@ -807,7 +781,11 @@ targets: | |
| mock.Anything, | ||
| mock.Anything, | ||
| mock.MatchedBy(func(j *job.Job) bool { | ||
| return j.WorkflowSpec.WorkflowOwner == wfOwner | ||
| match := j.WorkflowSpec.Workflow == wfJobSpec.Job().WorkflowSpec.Workflow | ||
| if !match { | ||
| t.Logf("got wf spec %s want %s", j.WorkflowSpec.Workflow, wfJobSpec.Job().WorkflowSpec.Workflow) | ||
| } | ||
| return match | ||
| }), | ||
| ). | ||
| Run(func(args mock.Arguments) { (args.Get(2).(*job.Job)).ID = 1 }). | ||
|
|
@@ -855,7 +833,11 @@ targets: | |
| mock.Anything, | ||
| mock.Anything, | ||
| mock.MatchedBy(func(j *job.Job) bool { | ||
| return j.WorkflowSpec.WorkflowOwner == wfOwner | ||
| match := j.WorkflowSpec.Workflow == wfJobSpec.Job().WorkflowSpec.Workflow | ||
| if !match { | ||
| t.Logf("got wf spec %s want %s", j.WorkflowSpec.Workflow, wfJobSpec.Job().WorkflowSpec.Workflow) | ||
| } | ||
| return match | ||
| }), | ||
| ). | ||
| Run(func(args mock.Arguments) { (args.Get(2).(*job.Job)).ID = 1 }). | ||
|
|
||
Oops, something went wrong.