From 7207f9d732a402eb57a48c82584d78f52b706075 Mon Sep 17 00:00:00 2001 From: Arya Date: Thu, 6 Oct 2022 06:36:42 -0400 Subject: [PATCH] waits for tip change after each commit call to the state-service in mempool_cancel_mined (#5347) --- zebrad/src/components/mempool/tests/vector.rs | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/zebrad/src/components/mempool/tests/vector.rs b/zebrad/src/components/mempool/tests/vector.rs index 32c157ea312..29b16868ead 100644 --- a/zebrad/src/components/mempool/tests/vector.rs +++ b/zebrad/src/components/mempool/tests/vector.rs @@ -417,6 +417,21 @@ async fn mempool_cancel_mined() -> Result<(), Report> { .await .unwrap(); + // Wait for the chain tip update + if let Err(timeout_error) = timeout( + CHAIN_TIP_UPDATE_WAIT_LIMIT, + chain_tip_change.wait_for_tip_change(), + ) + .await + .map(|change_result| change_result.expect("unexpected chain tip update failure")) + { + info!( + timeout = ?humantime_seconds(CHAIN_TIP_UPDATE_WAIT_LIMIT), + ?timeout_error, + "timeout waiting for chain tip change after committing block" + ); + } + // Query the mempool to make it poll chain_tip_change mempool.dummy_call().await; @@ -431,6 +446,21 @@ async fn mempool_cancel_mined() -> Result<(), Report> { .await .unwrap(); + // Wait for the chain tip update + if let Err(timeout_error) = timeout( + CHAIN_TIP_UPDATE_WAIT_LIMIT, + chain_tip_change.wait_for_tip_change(), + ) + .await + .map(|change_result| change_result.expect("unexpected chain tip update failure")) + { + info!( + timeout = ?humantime_seconds(CHAIN_TIP_UPDATE_WAIT_LIMIT), + ?timeout_error, + "timeout waiting for chain tip change after committing block" + ); + } + // Query the mempool to make it poll chain_tip_change mempool.dummy_call().await;