Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/3675.internal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AsyncENS tests were xfailing for the wrong reason.
10 changes: 9 additions & 1 deletion web3/_utils/ens.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,21 @@ def address(self, name: str) -> ChecksumAddress:
return self.registry.get(name, None)


class AsyncStaticENS:
def __init__(self, name_addr_pairs: Dict[str, ChecksumAddress]) -> None:
self.registry = dict(name_addr_pairs)

async def address(self, name: str) -> ChecksumAddress:
return self.registry.get(name, None)


@contextmanager
def ens_addresses(
w3: Union["Web3", "AsyncWeb3"], name_addr_pairs: Dict[str, ChecksumAddress]
) -> Iterator[None]:
original_ens = w3.ens
if w3.provider.is_async:
w3.ens = cast(AsyncENS, StaticENS(name_addr_pairs))
w3.ens = cast(AsyncENS, AsyncStaticENS(name_addr_pairs))
else:
w3.ens = cast(ENS, StaticENS(name_addr_pairs))
yield
Expand Down
7 changes: 0 additions & 7 deletions web3/_utils/module_testing/eth_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,6 @@ async def test_async_eth_sign_transaction_hex_fees(
assert result["tx"]["nonce"] == txn_params["nonce"]

@pytest.mark.asyncio
@pytest.mark.xfail(
reason="async name_to_address_middleware has not been implemented yet"
)
async def test_async_eth_sign_transaction_ens_names(
self, async_w3: "AsyncWeb3", async_keyfile_account_address: ChecksumAddress
) -> None:
Expand Down Expand Up @@ -2086,7 +2083,6 @@ async def test_async_eth_get_storage_at(
assert bytes(slot_4[:4]) == b"four"

@pytest.mark.asyncio
@pytest.mark.xfail
async def test_async_eth_get_storage_at_ens_name(
self, async_w3: "AsyncWeb3", async_storage_contract: "AsyncContract"
) -> None:
Expand Down Expand Up @@ -2238,9 +2234,6 @@ async def test_async_eth_sign(
assert new_signature != signature

@pytest.mark.asyncio
@pytest.mark.xfail(
reason="Async middleware to convert ENS names to addresses is missing"
)
async def test_async_eth_sign_ens_names(
self,
async_w3: "AsyncWeb3",
Expand Down