Skip to content

Commit 76fe6db

Browse files
authored
chore: refactoring after XTS speedup changes (#24622)
Signed-off-by: Alex Kehayov <aleks.kehayov@limechain.tech>
1 parent 0c44455 commit 76fe6db

File tree

9 files changed

+105
-232
lines changed

9 files changed

+105
-232
lines changed

.github/workflows/docs/citr-test-config.md

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

.github/workflows/zxc-execute-hapi-tests.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ on:
9393
type: string
9494
required: false
9595
default: "false"
96-
mats-suffix:
97-
description: "MATS Tag Suffix designation"
98-
type: string
99-
required: false
100-
default: ""
10196
secrets:
10297
access-token:
10398
description: "The GitHub access token used to checkout the repository, submodules, and make GitHub API calls."
@@ -288,7 +283,6 @@ jobs:
288283
env:
289284
LC_ALL: en.UTF-8
290285
LANG: en_US.UTF-8
291-
# Crypto uses same task for PR and MATS (no MATS suffix)
292286
run: ${GRADLE_EXEC} hapiTestCrypto --no-daemon && ${GRADLE_EXEC} hapiTestCryptoEmbedded --no-daemon && ${GRADLE_EXEC} hapiTestCryptoSerial --no-daemon
293287

294288
- name: Publish HAPI Test (Crypto) Report
@@ -354,8 +348,7 @@ jobs:
354348
env:
355349
LC_ALL: en.UTF-8
356350
LANG: en_US.UTF-8
357-
# Simple Fees uses same task for PR and MATS (no MATS suffix)
358-
run: ${GRADLE_EXEC} hapiTestSimpleFees --no-daemon && ${GRADLE_EXEC} hapiEmbeddedSimpleFees --no-daemon && ${GRADLE_EXEC} hapiTestSimpleFeesSerial --no-daemon
351+
run: ${GRADLE_EXEC} hapiTestSimpleFees --no-daemon && ${GRADLE_EXEC} hapiTestSimpleFeesEmbedded --no-daemon && ${GRADLE_EXEC} hapiTestSimpleFeesSerial --no-daemon
359352

360353
- name: Publish HAPI Test (Simple Fees) Report
361354
uses: step-security/publish-unit-test-result-action@7dff603bf17ef13dee847147bef8d7cd1728b566 # v2.22.0

.github/workflows/zxc-mats-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ jobs:
264264
enable-hapi-tests-state-throttling: "${{ inputs.enable-hapi-tests-state-throttling == 'true' }}"
265265
enable-hapi-tests-atomic-batch: "${{ inputs.enable-hapi-tests-atomic-batch == 'true' }}"
266266
enable-network-log-capture: "true"
267-
mats-suffix: "MATS"
268267
secrets:
269268
access-token: ${{ secrets.access-token }}
270269
gradle-cache-username: ${{ secrets.gradle-cache-username }}

hedera-node/test-clients/build.gradle.kts

Lines changed: 83 additions & 191 deletions
Large diffs are not rendered by default.

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/TestTags.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ private TestTags() {
77
throw new UnsupportedOperationException("Utility class");
88
}
99

10-
public static final String MATS = "MATS";
11-
1210
public static final String CRYPTO = "CRYPTO";
1311
public static final String SMART_CONTRACT = "SMART_CONTRACT";
1412
public static final String LONG_RUNNING = "LONG_RUNNING";

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/fees/SimpleFeesScheduleUpdateTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package com.hedera.services.bdd.suites.fees;
33

4-
import static com.hedera.services.bdd.junit.TestTags.MATS;
54
import static com.hedera.services.bdd.spec.HapiSpec.hapiTest;
65
import static com.hedera.services.bdd.spec.assertions.AccountInfoAsserts.changeFromSnapshot;
76
import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance;
@@ -20,9 +19,7 @@
2019
import com.hedera.services.bdd.junit.LeakyHapiTest;
2120
import java.util.stream.Stream;
2221
import org.junit.jupiter.api.DynamicTest;
23-
import org.junit.jupiter.api.Tag;
2422

25-
@Tag(MATS)
2623
public class SimpleFeesScheduleUpdateTest {
2724

2825
private static final String SIMPLE_FEES_SNAPSHOT = "simpleFeesSnapshot";

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip1261/TokenClaimAndCancelAirdropSimpleFeesTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import static com.hedera.node.app.service.token.AliasUtils.recoverAddressFromPubKey;
55
import static com.hedera.services.bdd.junit.EmbeddedReason.NEEDS_STATE_ACCESS;
6-
import static com.hedera.services.bdd.junit.TestTags.MATS;
76
import static com.hedera.services.bdd.junit.TestTags.SIMPLE_FEES;
87
import static com.hedera.services.bdd.spec.HapiSpec.hapiTest;
98
import static com.hedera.services.bdd.spec.assertions.AccountInfoAsserts.accountWith;
@@ -80,7 +79,6 @@
8079
import org.junit.jupiter.api.Nested;
8180
import org.junit.jupiter.api.Tag;
8281

83-
@Tag(MATS)
8482
@Tag(SIMPLE_FEES)
8583
@HapiTestLifecycle
8684
public class TokenClaimAndCancelAirdropSimpleFeesTest {

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip1261/TokenOpsShortPrefixTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package com.hedera.services.bdd.suites.hip1261;
33

4-
import static com.hedera.services.bdd.junit.TestTags.MATS;
54
import static com.hedera.services.bdd.junit.TestTags.SIMPLE_FEES;
65
import static com.hedera.services.bdd.spec.HapiSpec.hapiTest;
76
import static com.hedera.services.bdd.spec.keys.SigMapGenerator.Nature.UNIQUE_PREFIXES;
@@ -67,7 +66,6 @@
6766
* depending on actual key material, making the exact serialized transaction size
6867
* non-deterministic at authoring time.
6968
*/
70-
@Tag(MATS)
7169
@Tag(SIMPLE_FEES)
7270
@HapiTestLifecycle
7371
public class TokenOpsShortPrefixTest {

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/hip1261/UniquePrefixesSmokeTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package com.hedera.services.bdd.suites.hip1261;
33

4-
import static com.hedera.services.bdd.junit.TestTags.MATS;
54
import static com.hedera.services.bdd.junit.TestTags.SIMPLE_FEES;
65
import static com.hedera.services.bdd.spec.HapiSpec.hapiTest;
76
import static com.hedera.services.bdd.spec.keys.SigMapGenerator.Nature.UNIQUE_PREFIXES;
@@ -30,7 +29,6 @@
3029
* Smoke test that runs random mixed operations with UNIQUE_PREFIXES sig maps,
3130
* verifying broad transaction-type coverage with short prefix signing.
3231
*/
33-
@Tag(MATS)
3432
@Tag(SIMPLE_FEES)
3533
@HapiTestLifecycle
3634
public class UniquePrefixesSmokeTest {

0 commit comments

Comments
 (0)