From 5d3b9e157335595355833909f34b861e8d720797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Mon, 6 Mar 2023 11:13:28 +0000
Subject: [PATCH] test/e2e: wait for a first block before client cmds

---
 tests/src/e2e/ledger_tests.rs | 36 ++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs
index 4c32f6f498a..57f5d9cc7e5 100644
--- a/tests/src/e2e/ledger_tests.rs
+++ b/tests/src/e2e/ledger_tests.rs
@@ -289,7 +289,8 @@ fn ledger_txs_and_queries() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let _bg_ledger = ledger.background();
 
     let vp_user = wasm_abs_path(VP_USER_WASM);
@@ -528,7 +529,8 @@ fn masp_txs_and_queries() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
 
     let _bg_ledger = ledger.background();
 
@@ -794,7 +796,8 @@ fn masp_pinned_txs() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
 
     let _bg_ledger = ledger.background();
 
@@ -957,7 +960,8 @@ fn masp_incentives() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
 
     let _bg_ledger = ledger.background();
 
@@ -1655,9 +1659,9 @@ fn invalid_transactions() -> Result<()> {
     // 1. Run the ledger node
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
-    ledger.exp_string("Namada ledger node started")?;
-    // Wait to commit a block
-    ledger.exp_regex(r"Committed block hash.*, height: [0-9]+")?;
+
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
 
     let bg_ledger = ledger.background();
 
@@ -2016,7 +2020,8 @@ fn pos_init_validator() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let _bg_ledger = ledger.background();
 
     let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
@@ -2182,10 +2187,8 @@ fn ledger_many_txs_in_a_block() -> Result<()> {
     let mut ledger =
         run_as!(*test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
-
-    // Wait to commit a block
-    ledger.exp_regex(r"Committed block hash.*, height: [0-9]+")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let bg_ledger = ledger.background();
 
     let validator_one_rpc = Arc::new(get_actor_rpc(&test, &Who::Validator(0)));
@@ -2298,7 +2301,8 @@ fn proposal_submission() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let _bg_ledger = ledger.background();
 
     let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
@@ -2649,7 +2653,8 @@ fn proposal_offline() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(20))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let _bg_ledger = ledger.background();
 
     let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));
@@ -3327,7 +3332,8 @@ fn implicit_account_reveal_pk() -> Result<()> {
     let mut ledger =
         run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?;
 
-    ledger.exp_string("Namada ledger node started")?;
+    // Wait for a first block
+    ledger.exp_string("Committed block hash")?;
     let _bg_ledger = ledger.background();
 
     let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0));