Skip to content

Commit 13cc62f

Browse files
committed
Merge branch 'main' into 3858-ensure-rpc-params-array-length
2 parents 06f7028 + 3684f3c commit 13cc62f

File tree

10 files changed

+501
-165
lines changed

10 files changed

+501
-165
lines changed

.github/workflows/acceptance-public.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
testfilter: release_light
2929
envfile: ${{ inputs.network }}Acceptance.env
3030
operator_id: ${{ inputs.operator_id }}
31-
maxAttempts: 1
3231
secrets:
3332
operator_key: ${{ inputs.operator_key }}
3433
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/acceptance-workflow.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ on:
2626
relayTag:
2727
required: false
2828
type: string
29-
maxAttempts:
30-
required: false
31-
type: number
32-
default: 3
3329
secrets:
3430
operator_key:
3531
description: 'The ED25519, ECDSA, or DER encoded private key of the operator'
@@ -95,11 +91,7 @@ jobs:
9591
run: docker stop json-rpc-relay json-rpc-relay-ws
9692

9793
- name: Run acceptance tests
98-
uses: step-security/retry@2ab886c0de89f68f146c9b43f53e61abc59c46dc # v3.0.1
99-
with:
100-
max_attempts: ${{ inputs.maxAttempts }}
101-
timeout_minutes: 30
102-
command: |
94+
run: |
10395
if [[ -n "$OPERATOR_KEY" ]] && [[ "$OPERATOR_KEY" != "" ]]; then
10496
echo "Overriding OPERATOR_KEY_MAIN with the secret value"
10597
export OPERATOR_KEY_MAIN="$OPERATOR_KEY"

.github/workflows/dev-tool-workflow.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,4 @@ jobs:
6868
run: cd ${{ inputs.directory }}/ && npm ci
6969

7070
- name: Run the tests
71-
uses: step-security/retry@2ab886c0de89f68f146c9b43f53e61abc59c46dc # v3.0.1
72-
with:
73-
max_attempts: 10
74-
timeout_minutes: 10
75-
retry_wait_seconds: 45
76-
command: ${{ inputs.command }}
71+
run: ${{ inputs.command }}

.github/workflows/postman.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,4 @@ jobs:
6363
run: npm install -g newman
6464

6565
- name: Run the newman script
66-
uses: step-security/retry@2ab886c0de89f68f146c9b43f53e61abc59c46dc # v3.0.1
67-
with:
68-
max_attempts: 10
69-
timeout_minutes: 10
70-
retry_wait_seconds: 45
71-
command: newman run packages/server/tests/postman.json
66+
run: newman run packages/server/tests/postman.json

.github/workflows/release-acceptance.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ jobs:
7575
run: npm install @hashgraph/hedera-local -g
7676

7777
- name: Run acceptance tests
78-
uses: step-security/retry@2ab886c0de89f68f146c9b43f53e61abc59c46dc # v3.0.1
79-
with:
80-
max_attempts: 3
81-
timeout_minutes: 20
82-
command: npm run acceptancetest:release
78+
run: npm run acceptancetest:release
8379

8480
- name: Run hedera local
8581
run: hedera restart -d

packages/relay/src/lib/debug.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,13 @@ export class DebugImpl implements Debug {
410410
requestDetails,
411411
options,
412412
);
413+
414+
if (!response) {
415+
throw predefined.RESOURCE_NOT_FOUND(
416+
`Failed to retrieve contract results for transaction ${transactionIdOrHash}`,
417+
);
418+
}
419+
413420
return await this.formatOpcodesResult(response, options);
414421
} catch (e) {
415422
throw this.common.genericErrorHandler(e);

packages/relay/src/lib/validators/objectTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export const OBJECTS_VALIDATIONS: { [key: string]: IObjectSchema } = {
102102
tracerConfigWrapper: {
103103
name: 'TracerConfigWrapper',
104104
failOnEmpty: true,
105-
failOnUnexpectedParams: false,
105+
failOnUnexpectedParams: true,
106106
properties: {
107107
tracer: {
108108
type: 'tracerType',

0 commit comments

Comments
 (0)