From 4de68f7660bf5d938cf027b2a18cab54252ff158 Mon Sep 17 00:00:00 2001
From: "Raymond E. Pasco" <raymond@heliax.dev>
Date: Tue, 27 Jun 2023 16:21:51 -0400
Subject: [PATCH] tests/e2e: replace PoS test epoch waits with epoch-sleeps

PoS hammered the node as fast as possible with epoch queries in its
tests to wait for a specified epoch. Instead, epoch-sleep repeatedly
until the target epoch has been reached.

This could be improved further by adding an --until parameter to
epoch-sleep.
---
 tests/src/e2e/ledger_tests.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs
index d24aa9e2a5..034a9503f1 100644
--- a/tests/src/e2e/ledger_tests.rs
+++ b/tests/src/e2e/ledger_tests.rs
@@ -2151,7 +2151,7 @@ fn pos_bonds() -> Result<()> {
                 delegation_withdrawable_epoch
             );
         }
-        let epoch = get_epoch(&test, &validator_one_rpc)?;
+        let epoch = epoch_sleep(&test, &validator_one_rpc, 40)?;
         if epoch >= delegation_withdrawable_epoch {
             break;
         }
@@ -2358,7 +2358,7 @@ fn pos_rewards() -> Result<()> {
         if Instant::now().duration_since(start) > loop_timeout {
             panic!("Timed out waiting for epoch: {}", wait_epoch);
         }
-        let epoch = get_epoch(&test, &validator_zero_rpc)?;
+        let epoch = epoch_sleep(&test, &validator_zero_rpc, 40)?;
         if dbg!(epoch) >= wait_epoch {
             break;
         }
@@ -2441,7 +2441,7 @@ fn test_bond_queries() -> Result<()> {
         if Instant::now().duration_since(start) > loop_timeout {
             panic!("Timed out waiting for epoch: {}", 1);
         }
-        let epoch = get_epoch(&test, &validator_one_rpc)?;
+        let epoch = epoch_sleep(&test, &validator_one_rpc, 40)?;
         if epoch >= Epoch(4) {
             break;
         }
@@ -2500,7 +2500,7 @@ fn test_bond_queries() -> Result<()> {
 
     // 6. Wait for withdraw_epoch
     loop {
-        let epoch = epoch_sleep(&test, &validator_one_rpc, 120)?;
+        let epoch = epoch_sleep(&test, &validator_one_rpc, 40)?;
         if epoch >= withdraw_epoch {
             break;
         }
@@ -2740,7 +2740,7 @@ fn pos_init_validator() -> Result<()> {
         if Instant::now().duration_since(start) > loop_timeout {
             panic!("Timed out waiting for epoch: {}", earliest_update_epoch);
         }
-        let epoch = get_epoch(&test, &non_validator_rpc)?;
+        let epoch = epoch_sleep(&test, &non_validator_rpc, 40)?;
         if epoch >= earliest_update_epoch {
             break;
         }