From f6ca04e52a79f05ff2ddfec96556867a0fb22f41 Mon Sep 17 00:00:00 2001 From: brentstone Date: Mon, 20 May 2024 17:08:06 -0700 Subject: [PATCH] fixup! Merge branch 'grarco/masp-fees' (#3217) --- .github/workflows/scripts/hermes.txt | 2 +- crates/tests/src/e2e/ibc_tests.rs | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/hermes.txt b/.github/workflows/scripts/hermes.txt index 03726c5ea59..7588db229e5 100644 --- a/.github/workflows/scripts/hermes.txt +++ b/.github/workflows/scripts/hermes.txt @@ -1 +1 @@ -1.7.4-namada-beta9-rc2 +1.8.2-namada-beta10-rc diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs index eef22981e26..0346366a685 100644 --- a/crates/tests/src/e2e/ibc_tests.rs +++ b/crates/tests/src/e2e/ibc_tests.rs @@ -747,7 +747,9 @@ fn ibc_rate_limit() -> Result<()> { &channel_id_a, None, // expect an error of the throughput limit - Some("Transaction was rejected by VPs"), + Some( + "Transfer exceeding the per-epoch throughput limit is not allowed", + ), false, )?; @@ -1017,10 +1019,15 @@ fn wait_for_packet_relay( // Check no pending packet if hermes .exp_string( - "\"dst\":{\"unreceived_acks\":[],\"unreceived_packets\":[]},\"\ - src\":{\"unreceived_acks\":[],\"unreceived_packets\":[]}", + "\"dst\":{\"unreceived_acks\":[],\"unreceived_packets\":[]},", ) .is_ok() + && hermes + .exp_string( + "\"src\":{\"unreceived_acks\":[],\"unreceived_packets\":\ + []}", + ) + .is_ok() { return Ok(()); }