From 6de8993bf27583e41a3b995a52de394526e339cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Tue, 11 Jul 2023 08:04:53 +0100 Subject: [PATCH 1/2] test/e2e/double_signing: path for validator copy that keeps logs in CI --- tests/src/e2e/ledger_tests.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 3f22402c2c..3c16d724e2 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -4413,8 +4413,13 @@ fn double_signing_gets_slashed() -> Result<()> { // 2. Copy the first genesis validator base-dir let validator_0_base_dir = test.get_base_dir(&Who::Validator(0)); - let validator_0_base_dir_copy = - test.test_dir.path().join("validator-0-copy"); + let validator_0_base_dir_copy = test + .test_dir + .path() + .join(test.net.chain_id.as_str()) + .join(client::utils::NET_ACCOUNTS_DIR) + .join("validator-0-copy") + .join(namada_apps::config::DEFAULT_BASE_DIR); fs_extra::dir::copy( validator_0_base_dir, &validator_0_base_dir_copy, From f1874eaa55672adff48060249bf4d179b428d68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Tue, 11 Jul 2023 09:57:08 +0100 Subject: [PATCH 2/2] test/e2e/proposal_submission: wait for proposal to be committed --- tests/src/e2e/ledger_tests.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs index 3c16d724e2..dbae6a6630 100644 --- a/tests/src/e2e/ledger_tests.rs +++ b/tests/src/e2e/ledger_tests.rs @@ -2893,7 +2893,7 @@ fn proposal_submission() -> Result<()> { run_as!(test, Who::Validator(0), Bin::Node, &["ledger"], Some(40))?; wait_for_wasm_pre_compile(&mut ledger)?; - let _bg_ledger = ledger.background(); + let bg_ledger = ledger.background(); let validator_one_rpc = get_actor_rpc(&test, &Who::Validator(0)); @@ -2944,6 +2944,11 @@ fn proposal_submission() -> Result<()> { client.exp_string("Transaction is valid.")?; client.assert_success(); + // Wait for the proposal to be committed + let mut ledger = bg_ledger.foreground(); + ledger.exp_string("Committed block hash")?; + let _bg_ledger = ledger.background(); + // 3. Query the proposal let proposal_query_args = vec![ "query-proposal",