refactoring

Signed-off-by: Alex Kehayov <aleks.kehayov@limechain.tech>

Author: AlexKehayov

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/regression/system/QuiesceThenMixedOpsRestartTest.java

@@ -12,9 +12,9 @@
 import static com.hedera.services.bdd.spec.transactions.crypto.HapiCryptoTransfer.tinyBarsFromTo;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.assertHgcaaLogContainsTimeframe;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.doWithStartupDuration;
+import static com.hedera.services.bdd.spec.utilops.UtilVerbs.doingContextual;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.overridingAllOf;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.sleepForSeconds;
-import static com.hedera.services.bdd.spec.utilops.UtilVerbs.withOpContext;
 import static com.hedera.services.bdd.suites.HapiSuite.FUNDING;
 import static com.hedera.services.bdd.suites.HapiSuite.GENESIS;
 import static com.hedera.services.bdd.suites.HapiSuite.ONE_HBAR;
@@ -46,7 +46,7 @@ public class QuiesceThenMixedOpsRestartTest implements LifecycleTest {
     @LeakyHapiTest(overrides = {"staking.periodMins", "nodes.nodeRewardsEnabled"})
     final Stream<DynamicTest> quiesceAndThenRestartMixedOps() {
         final AtomicReference<Instant> scheduleExpiry = new AtomicReference<>();
-        final AtomicReference<Instant> sleepStart = new AtomicReference<>();
+        final AtomicReference<Instant> logAssertionStart = new AtomicReference<>();
         return hapiTest(
                 // Override properties that interfere with the idle->QUIESCE
                 // transition and restart so they take effect with a fresh
@@ -59,6 +59,7 @@ final Stream<DynamicTest> quiesceAndThenRestartMixedOps() {
                 cryptoTransfer(tinyBarsFromTo(GENESIS, FUNDING, 1)),
                 // --- actual test workflow ---
                 cryptoCreate("scheduledReceiver").via("txn").balance(41 * ONE_HBAR),
+                doingContextual((ignored) -> logAssertionStart.set(Instant.now())),
                 doWithStartupDuration("quiescence.tctDuration", duration -> scheduleCreate(
                                 "schedule", cryptoTransfer(tinyBarsFromTo(GENESIS, "scheduledReceiver", ONE_HBAR)))
                         .payingWith(GENESIS)
@@ -69,13 +70,12 @@ final Stream<DynamicTest> quiesceAndThenRestartMixedOps() {
                 getScheduleInfo("schedule")
                         .exposingInfoTo(info -> scheduleExpiry.set(asInstant(info.getExpirationTime())))
                         .logged(),
-                withOpContext((spec, opLog) -> sleepStart.set(Instant.now())),
                 doWithStartupDuration("quiescence.tctDuration", duration -> sleepForSeconds(2 * duration.toSeconds())),
                 assertHgcaaLogContainsTimeframe(
                         NodeSelector.byNodeId(0),
-                        sleepStart::get,
-                        Duration.ofSeconds(30),
-                        Duration.ofSeconds(30),
+                        logAssertionStart::get,
+                        Duration.ofSeconds(20),
+                        Duration.ofSeconds(5),
                         "to QUIESCE"),
                 doWithStartupDuration("quiescence.tctDuration", duration -> sleepForSeconds(4 * duration.toSeconds())),
                 getAccountBalance("scheduledReceiver").hasTinyBars(42 * ONE_HBAR),