From 19dfb87b1fd5e0e29e8bba9cffb15d8e2fb8f550 Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Tue, 24 Mar 2020 16:57:28 +0800 Subject: [PATCH] Fix timeout for subscriptions test (#9043) automerge --- core/tests/rpc.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/tests/rpc.rs b/core/tests/rpc.rs index e4b594aa27..a5056d806f 100644 --- a/core/tests/rpc.rs +++ b/core/tests/rpc.rs @@ -271,7 +271,7 @@ fn test_rpc_subscriptions() { }); let rpc_client = RpcClient::new_socket(leader_data.rpc); - let transaction_count = rpc_client + let mut transaction_count = rpc_client .get_transaction_count_with_commitment(CommitmentConfig::recent()) .unwrap(); @@ -281,10 +281,10 @@ fn test_rpc_subscriptions() { .send_to(&bincode::serialize(&tx).unwrap(), leader_data.tpu) .unwrap(); }); - let mut x = 0; let now = Instant::now(); - while x < transaction_count + 500 || now.elapsed() > Duration::from_secs(5) { - x = rpc_client + let expected_transaction_count = transaction_count + transactions.len() as u64; + while transaction_count < expected_transaction_count && now.elapsed() < Duration::from_secs(5) { + transaction_count = rpc_client .get_transaction_count_with_commitment(CommitmentConfig::recent()) .unwrap(); sleep(Duration::from_millis(200));