From 6281844a8b7627b46bef1f6ac6ce54d5fce8eb83 Mon Sep 17 00:00:00 2001
From: fselmo <fselmo2@gmail.com>
Date: Mon, 31 Jul 2023 10:53:27 -0600
Subject: [PATCH] Some Web3 -> AsyncWeb3 changes for
 AsyncEthereumTesterProvider tests

- Add newsfragment for #3069
---
 newsfragments/3069.internal.rst                   |  1 +
 tests/core/conftest.py                            | 12 +++++-------
 tests/core/eth-module/test_accounts.py            |  3 ++-
 tests/core/middleware/test_attrdict_middleware.py |  5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 newsfragments/3069.internal.rst

diff --git a/newsfragments/3069.internal.rst b/newsfragments/3069.internal.rst
new file mode 100644
index 0000000000..abb5a6e36b
--- /dev/null
+++ b/newsfragments/3069.internal.rst
@@ -0,0 +1 @@
+Minor fixes to type hinting in the core tests setup fixtures.
diff --git a/tests/core/conftest.py b/tests/core/conftest.py
index daf0b336d5..c9be903a39 100644
--- a/tests/core/conftest.py
+++ b/tests/core/conftest.py
@@ -3,7 +3,7 @@
 import pytest_asyncio
 
 from web3 import (
-    Web3,
+    AsyncWeb3,
 )
 from web3.eth import (
     AsyncEth,
@@ -119,18 +119,16 @@ def __init__(self, a, b):
     return ModuleManyArgs
 
 
-@pytest_asyncio.fixture()
+@pytest_asyncio.fixture
 async def async_w3():
-    provider = AsyncEthereumTesterProvider()
-    w3 = Web3(provider, modules={"eth": [AsyncEth]}, middlewares=provider.middlewares)
+    w3 = AsyncWeb3(AsyncEthereumTesterProvider())
     w3.eth.default_account = await w3.eth.coinbase
     return w3
 
 
-@pytest_asyncio.fixture()
+@pytest_asyncio.fixture
 async def async_w3_non_strict_abi():
-    provider = AsyncEthereumTesterProvider()
-    w3 = Web3(provider, modules={"eth": [AsyncEth]}, middlewares=provider.middlewares)
+    w3 = AsyncWeb3(AsyncEthereumTesterProvider())
     w3.strict_bytes_type_checking = False
     w3.eth.default_account = await w3.eth.coinbase
     return w3
diff --git a/tests/core/eth-module/test_accounts.py b/tests/core/eth-module/test_accounts.py
index 8f6b9c6271..69d9d6844e 100644
--- a/tests/core/eth-module/test_accounts.py
+++ b/tests/core/eth-module/test_accounts.py
@@ -26,6 +26,7 @@
 
 from web3 import (
     Account,
+    AsyncWeb3,
     Web3,
 )
 from web3.eth import (
@@ -557,7 +558,7 @@ def test_eth_account_sign_and_send_EIP155_transaction_to_eth_tester(
 
 @pytest.fixture()
 def async_w3():
-    return Web3(AsyncEthereumTesterProvider(), modules={"eth": [AsyncEth]})
+    return AsyncWeb3(AsyncEthereumTesterProvider())
 
 
 @patch("web3.eth.BaseEth.account", "wired via BaseEth")
diff --git a/tests/core/middleware/test_attrdict_middleware.py b/tests/core/middleware/test_attrdict_middleware.py
index b0d0e62e50..21d6de8717 100644
--- a/tests/core/middleware/test_attrdict_middleware.py
+++ b/tests/core/middleware/test_attrdict_middleware.py
@@ -1,6 +1,7 @@
 import pytest
 
 from web3 import (
+    AsyncWeb3,
     EthereumTesterProvider,
     Web3,
 )
@@ -98,7 +99,7 @@ def test_no_attrdict_middleware_does_not_convert_dicts_to_attrdict():
 
 @pytest.mark.asyncio
 async def test_async_attrdict_middleware_default_for_async_ethereum_tester_provider():
-    async_w3 = Web3(AsyncEthereumTesterProvider())
+    async_w3 = AsyncWeb3(AsyncEthereumTesterProvider())
     assert async_w3.middleware_onion.get("attrdict") == async_attrdict_middleware
 
 
@@ -132,7 +133,7 @@ async def test_async_attrdict_middleware_is_recursive(async_w3):
 
 @pytest.mark.asyncio
 async def test_no_async_attrdict_middleware_does_not_convert_dicts_to_attrdict():
-    async_w3 = Web3(AsyncEthereumTesterProvider())
+    async_w3 = AsyncWeb3(AsyncEthereumTesterProvider())
 
     async_w3.middleware_onion.inject(
         await async_construct_result_generator_middleware(