From 7bc05615c5ec9e4e48a8b6b0a5fff189da59b762 Mon Sep 17 00:00:00 2001
From: Kristina Nikolaeva
 <112946046+kristinaNikolaevaa@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:13:41 +0200
Subject: [PATCH] fix test_eth_block_number_next_block_different (#400)

---
 integration/tests/basic/rpc/test_rpc_base_calls.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/integration/tests/basic/rpc/test_rpc_base_calls.py b/integration/tests/basic/rpc/test_rpc_base_calls.py
index 850eb18ba2..b4420d2532 100644
--- a/integration/tests/basic/rpc/test_rpc_base_calls.py
+++ b/integration/tests/basic/rpc/test_rpc_base_calls.py
@@ -15,7 +15,7 @@
     is_hex,
 )
 from utils.accounts import EthAccounts
-from utils.helpers import cryptohex, gen_hash_of_block
+from utils.helpers import cryptohex, gen_hash_of_block, wait_condition
 from utils.models.error import EthError, EthError32602, NotSupportedMethodError
 from utils.models.result import (
     EthGasPriceResult,
@@ -260,16 +260,9 @@ def test_eth_block_number(self, json_rpc_client):
     @pytest.mark.mainnet
     def test_eth_block_number_next_block_different(self, json_rpc_client):
         response = json_rpc_client.send_rpc(method="eth_blockNumber")
-        time.sleep(1)
-        response2 = json_rpc_client.send_rpc(method="eth_blockNumber")
+        assert wait_condition(lambda: json_rpc_client.send_rpc(
+            method="eth_blockNumber")["result"] != response["result"], timeout_sec=10)
 
-        assert "error" not in response and "error" not in response2
-        assert "result" in response and "result" in response2
-        assert rpc_checks.is_hex(response["result"]), f"Invalid response result {response['result']}"
-        assert rpc_checks.is_hex(response2["result"]), f"Invalid response result {response2['result']}"
-        assert response["result"] != response2["result"]
-        EthResult(**response)
-        EthResult(**response2)
 
     # Geth returns different error message for None NDEV-3169
     @pytest.mark.mainnet