Cherry pick for release 0.42 account balance test (#8866)

Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com>
hashgraph · Sep 29, 2023 · 2ec9acb · 2ec9acb
1 parent 1273afa
commit 2ec9acb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/.../src/main/java/com/hedera/services/bdd/suites/perf/AccountBalancesClientSaveLoadTest.java b/.../src/main/java/com/hedera/services/bdd/suites/perf/AccountBalancesClientSaveLoadTest.java
@@ -42,7 +42,6 @@
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BUSY;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.DUPLICATE_TRANSACTION;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TOKEN_BALANCE;
-import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TX_FEE;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SIGNATURE;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.PLATFORM_TRANSACTION_NOT_CREATED;
@@ -75,8 +74,8 @@
 
 public class AccountBalancesClientSaveLoadTest extends LoadTest {
     private static final Logger LOG = LogManager.getLogger(AccountBalancesClientSaveLoadTest.class);
-    static final int MAX_PENDING_OPS_FOR_SETUP = 10_000;
-    static final int TOTAL_ACCOUNT = 200_000;
+    static final int MAX_PENDING_OPS_FOR_SETUP = 1000;
+    static final int TOTAL_ACCOUNT = 20000;
     static final int ESTIMATED_TOKEN_CREATION_RATE = 50;
     static final int ESTIMATED_CRYPTO_CREATION_RATE = 500;
     static final long MIN_ACCOUNT_BALANCE = 1_000_000_000L;
@@ -132,9 +131,7 @@ private HapiSpec runAccountBalancesClientSaveLoadTest() {
                         fileUpdate(THROTTLE_DEFS).payingWith(GENESIS).contents(throttlesForJRS.toByteArray()))
                 .when(
                         sourcing(() -> runWithProvider(accountsCreate(settings))
-                                .lasting(
-                                        () -> totalAccounts / ESTIMATED_CRYPTO_CREATION_RATE + 10,
-                                        () -> TimeUnit.SECONDS)
+                                .lasting(() -> totalAccounts / settings.getTps() + 30, () -> TimeUnit.SECONDS)
                                 .totalOpsToSumbit(() -> totalAccounts)
                                 .maxOpsPerSec(settings::getTps)
                                 .maxPendingOps(() -> MAX_PENDING_OPS_FOR_SETUP)),
@@ -157,7 +154,7 @@ private HapiSpec runAccountBalancesClientSaveLoadTest() {
                                 .maxOpsPerSec(settings::getTps)
                                 .maxPendingOps(() -> MAX_PENDING_OPS_FOR_SETUP)))
                 .then(
-                        sleepFor(10L * SECOND),
+                        sleepFor(30L * SECOND),
                         withOpContext((spec, log) -> {
                             if (settings.getBooleanProperty("clientToExportBalances", false)) {
                                 log.info("Now get all {} accounts created and save them", totalAccounts);
@@ -207,7 +204,7 @@ private Function<HapiSpec, OpProvider> accountsCreate(PerfTestLoadSettings setti
         LOG.info("Total accounts: {}", totalAccounts);
         LOG.info("Total tokens: {}", totalTestTokens);
 
-        AtomicInteger moreToCreate = new AtomicInteger(totalAccounts);
+        AtomicInteger moreToCreate = new AtomicInteger(1);
 
         return spec -> new OpProvider() {
             @Override
@@ -219,19 +216,18 @@ public List<HapiSpecOperation> suggestedInitializers() {
             @Override
             public Optional<HapiSpecOperation> get() {
                 int next;
-                next = moreToCreate.getAndDecrement();
-                if (next <= 0) {
+                next = moreToCreate.getAndIncrement();
+                if (next > totalAccounts) {
                     return Optional.empty();
                 }
 
                 var op = cryptoCreate(String.format("%s%d", ACCT_NAME_PREFIX, next))
                         .balance((RANDOM.nextInt((int) ONE_HBAR) + MIN_ACCOUNT_BALANCE))
                         .key(GENESIS)
                         .fee(ONE_HUNDRED_HBARS)
-                        .withRecharging()
                         .rechargeWindow(30)
                         .hasRetryPrecheckFrom(NOISY_RETRY_PRECHECKS)
-                        .hasPrecheckFrom(DUPLICATE_TRANSACTION, OK, INSUFFICIENT_TX_FEE)
+                        .hasPrecheckFrom(DUPLICATE_TRANSACTION, OK)
                         .hasKnownStatusFrom(SUCCESS, INVALID_SIGNATURE)
                         .noLogging()
                         .deferStatusResolution();

diff --git a/...com/hedera/services/bdd/suites/perf/crypto/CryptoTransferLoadTestWithInvalidAccounts.java b/...com/hedera/services/bdd/suites/perf/crypto/CryptoTransferLoadTestWithInvalidAccounts.java
@@ -60,7 +60,6 @@ protected HapiSpec runCryptoTransfers() {
                     .fee(100_000_000L)
                     .hasKnownStatusFrom(INVALID_ACCOUNT_ID)
                     .hasRetryPrecheckFrom(BUSY, PLATFORM_TRANSACTION_NOT_CREATED)
-                    .deferStatusResolution()
         };
 
         return defaultHapiSpec("RunCryptoTransfers")