Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Functions] Update default job spec in scripts and tests #8598

Merged
merged 2 commits into from
Mar 8, 2023
Merged

[Functions] Update default job spec in scripts and tests #8598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a798b77
[Functions] Update default job spec in scripts and tests
bolekk Mar 1, 2023
1a05a49
Merge branch 'develop' into chore/update-functions-job-spec
bolekk Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/scripts/functions/templates/oracle.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ transmitterID = "{{node_eth_address}}"
observationSource = """
decode_log [type="ethabidecodelog" abi="OracleRequest(bytes32 indexed requestId, address requestingContract, address requestInitiator, uint64 subscriptionId, address subscriptionOwner, bytes data)" data="$(jobRun.logData)" topics="$(jobRun.logTopics)"]
decode_cbor [type="cborparse" data="$(decode_log.data)"]
run_computation [type="bridge" name="ea_bridge" requestData="{\\"requestId\\": $(jobRun.meta.oracleRequest.requestId), \\"jobName\\": $(jobSpec.name), \\"subscriptionOwner\\": $(decode_log.subscriptionOwner), \\"subscriptionId\\": $(decode_log.subscriptionId), \\"data\\": $(decode_cbor)}" timeout="20s"]
run_computation [type="bridge" name="ea_bridge" requestData="{\\"requestId\\": $(jobRun.meta.oracleRequest.requestId), \\"jobName\\": $(jobSpec.name), \\"subscriptionOwner\\": $(decode_log.subscriptionOwner), \\"subscriptionId\\": $(decode_log.subscriptionId), \\"data\\": $(decode_cbor)}"]
parse_result [type=jsonparse data="$(run_computation)" path="data,result"]
parse_error [type=jsonparse data="$(run_computation)" path="data,error"]

Expand All @@ -30,3 +30,4 @@ requestTimeoutSec = 300
requestTimeoutCheckFrequencySec = 10
requestTimeoutBatchLookupSize = 20
listenerEventHandlerTimeoutSec = 120
maxRequestSizeBytes = 30720
3 changes: 2 additions & 1 deletion core/services/ocr2/plugins/directrequestocr/test/internal/testutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ func AddOCR2Job(t *testing.T, app *cltest.TestApplication, contractAddress commo
observationSource = """
decode_log [type="ethabidecodelog" abi="OracleRequest(bytes32 indexed requestId, address requestingContract, address requestInitiator, uint64 subscriptionId, address subscriptionOwner, bytes data)" data="$(jobRun.logData)" topics="$(jobRun.logTopics)"]
decode_cbor [type="cborparse" data="$(decode_log.data)"]
run_computation [type="bridge" name="ea_bridge" requestData="{\\"id\\": $(jobSpec.externalJobID), \\"data\\": $(decode_cbor)}" timeout="20s"]
run_computation [type="bridge" name="ea_bridge" requestData="{\\"id\\": $(jobSpec.externalJobID), \\"data\\": $(decode_cbor)}"]
parse_result [type=jsonparse data="$(run_computation)" path="data,result"]
parse_error [type=jsonparse data="$(run_computation)" path="data,error"]

Expand All @@ -366,6 +366,7 @@ func AddOCR2Job(t *testing.T, app *cltest.TestApplication, contractAddress commo
requestTimeoutCheckFrequencySec = 10
requestTimeoutBatchLookupSize = 20
listenerEventHandlerTimeoutSec = 120
maxRequestSizeBytes = 30720
`, contractAddress, keyBundleID, transmitter))
require.NoError(t, err)
err = app.AddJobV2(testutils.Context(t), &job)
Expand Down