Give more stability to tests using either "pending" or "latest":

- Set a timeout and loop over the latest block a few times until desired
  tx is included.

- Some processing, such as async IPC, goes faster than others. There'stability
  not a great way to ensure if we are in the "pending" or "latest" state for
  blocks using geth --dev. The important thing for testing on our end is that the
  JSON-RPC method works the way it's expected. Whether or not it returns the
  expected result based on block number, etc, is on Geth's side to make sure.
  Test the JSON-RPC method and give it flexibility in this commit.

Author: fselmo

web3/_utils/module_testing/eth_module.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 import math
 import pytest
@@ -992,9 +993,8 @@ async def test_eth_getBlockByNumber_not_found(
     async def test_eth_getBlockByNumber_pending(
         self, async_w3: "AsyncWeb3", async_empty_block: BlockData
     ) -> None:
-        current_block_number = await async_w3.eth.block_number
         block = await async_w3.eth.get_block("pending")
-        assert block["number"] == current_block_number + 1
+        assert block["hash"] is None
 
     @pytest.mark.asyncio
     async def test_eth_getBlockByNumber_earliest(
@@ -1086,16 +1086,23 @@ async def test_eth_get_raw_transaction_by_block(
         async_keyfile_account_address_dual_type: ChecksumAddress,
     ) -> None:
         # eth_getRawTransactionByBlockNumberAndIndex: block identifier
-        # send a tx and wait until the latest block includes it
-        tx_hash = await async_w3.eth.send_transaction(
+        await async_w3.eth.send_transaction(
             {
                 "from": async_keyfile_account_address_dual_type,
                 "to": async_keyfile_account_address_dual_type,
                 "value": Wei(1),
             }
         )
-        await async_w3.eth.wait_for_transaction_receipt(tx_hash)
-        raw_txn = await async_w3.eth.get_raw_transaction_by_block("latest", 0)
+
+        async def wait_for_block_with_txn() -> HexBytes:
+            while True:
+                try:
+                    return await async_w3.eth.get_raw_transaction_by_block("latest", 0)
+                except TransactionNotFound:
+                    await asyncio.sleep(0.1)
+                    continue
+
+        raw_txn = await asyncio.wait_for(wait_for_block_with_txn(), timeout=5)
         assert is_bytes(raw_txn)
 
         # eth_getRawTransactionByBlockNumberAndIndex: block number
@@ -4698,16 +4705,20 @@ def test_eth_get_raw_transaction_by_block(
         block_with_txn: BlockData,
     ) -> None:
         # eth_getRawTransactionByBlockNumberAndIndex: block identifier
-        # send a tx and wait until the latest block includes it
-        tx_hash = w3.eth.send_transaction(
+        w3.eth.send_transaction(
             {
                 "from": keyfile_account_address_dual_type,
                 "to": keyfile_account_address_dual_type,
                 "value": Wei(1),
             }
         )
-        w3.eth.wait_for_transaction_receipt(tx_hash)
-        raw_transaction = w3.eth.get_raw_transaction_by_block("latest", 0)
+        raw_transaction = None
+        while not raw_transaction:
+            try:
+                raw_transaction = w3.eth.get_raw_transaction_by_block("latest", 0)
+            except TransactionNotFound:
+                continue
+
         assert is_bytes(raw_transaction)
 
         # eth_getRawTransactionByBlockNumberAndIndex: block number