From d778188a3e5fe2a7e9444bdf5801c71364d2493f Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Tue, 28 May 2024 18:11:19 +0200 Subject: [PATCH] Customizable sleep time for packet relay in ibc tests --- crates/tests/src/e2e/ibc_tests.rs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs index 6d281c12f38..b40f28a478f 100644 --- a/crates/tests/src/e2e/ibc_tests.rs +++ b/crates/tests/src/e2e/ibc_tests.rs @@ -229,7 +229,7 @@ fn run_ledger_ibc_with_hermes() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; check_balances(&port_id_b, &channel_id_b, &test_a, &test_b)?; // Transfer 50000 received over IBC on Chain B @@ -257,7 +257,7 @@ fn run_ledger_ibc_with_hermes() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; check_balances_after_back(&port_id_b, &channel_id_b, &test_a, &test_b)?; // Send a token to the shielded address on Chain A @@ -284,7 +284,7 @@ fn run_ledger_ibc_with_hermes() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; check_shielded_balances(&port_id_b, &channel_id_b, &test_a, &test_b)?; // Shielded transfer to an invalid receiver address (refund) @@ -301,7 +301,7 @@ fn run_ledger_ibc_with_hermes() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; // The balance should not be changed check_shielded_balances(&port_id_b, &channel_id_b, &test_a, &test_b)?; @@ -330,7 +330,7 @@ fn run_ledger_ibc_with_hermes() -> Result<()> { let hermes = run_hermes(&test_a)?; let _bg_hermes = hermes.background(); - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; // The balance should not be changed check_shielded_balances(&port_id_b, &channel_id_b, &test_a, &test_b)?; @@ -388,7 +388,7 @@ fn ibc_namada_gaia() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test)?; + wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test, None)?; // Check the received token on Gaia let token_addr = find_address(&test, APFEL)?; @@ -406,7 +406,7 @@ fn ibc_namada_gaia() -> Result<()> { &port_id_gaia, &channel_id_gaia, )?; - wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test)?; + wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test, None)?; // Check the token on Namada check_balance(&test, ALBERT, APFEL, 999900)?; @@ -422,7 +422,7 @@ fn ibc_namada_gaia() -> Result<()> { &port_id_gaia, &channel_id_gaia, )?; - wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test)?; + wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test, None)?; // Check the token on Namada let ibc_denom = format!("{port_id_namada}/{channel_id_namada}/{GAIA_COIN}"); @@ -443,7 +443,7 @@ fn ibc_namada_gaia() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test)?; + wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test, None)?; // Check the received token on Gaia check_gaia_balance(&test_gaia, GAIA_USER, GAIA_COIN, 900)?; @@ -457,7 +457,7 @@ fn ibc_namada_gaia() -> Result<()> { &port_id_gaia, &channel_id_gaia, )?; - wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test_gaia)?; + wait_for_packet_relay(&port_id_gaia, &channel_id_gaia, &test_gaia, None)?; // Check the token on Namada let ibc_denom = format!("{port_id_namada}/{channel_id_namada}/{GAIA_COIN}"); @@ -489,7 +489,7 @@ fn ibc_namada_gaia() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test)?; + wait_for_packet_relay(&port_id_namada, &channel_id_namada, &test, None)?; check_balance(&test, AB_VIEWING_KEY, &ibc_denom, 40)?; check_gaia_balance(&test_gaia, GAIA_USER, GAIA_COIN, 810)?; @@ -648,7 +648,7 @@ fn proposal_ibc_token_inflation() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, Some(20))?; // wait the next epoch to dispense the rewrad wait_epochs(&test_b, MASP_EPOCH_MULTIPLIER)?; @@ -780,7 +780,7 @@ fn ibc_rate_limit() -> Result<()> { None, false, )?; - wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a)?; + wait_for_packet_relay(&port_id_a, &channel_id_a, &test_a, None)?; // Check the balance on Chain B let ibc_denom = format!("{port_id_b}/{channel_id_b}/nam"); @@ -981,6 +981,7 @@ fn wait_for_packet_relay( port_id: &PortId, channel_id: &ChannelId, test: &Test, + seconds: Option, ) -> Result<()> { let args = [ "--json", @@ -995,7 +996,7 @@ fn wait_for_packet_relay( channel_id.as_str(), ]; for _ in 0..10 { - sleep(10); + sleep(seconds.unwrap_or(10)); let mut hermes = run_hermes_cmd(test, args, Some(40))?; // Check no pending packet if hermes