chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.6.0rc2__py3-none-any.whl

chia/_tests/core/mempool/test_singleton_fast_forward.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copy
 import dataclasses
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from chia_rs import AugSchemeMPL, CoinSpend, G1Element, G2Element, PrivateKey, SpendBundle
@@ -59,7 +59,7 @@ def test_process_fast_forward_spends_nothing_to_do() -> None:
     original_version = dataclasses.replace(internal_mempool_item)
     singleton_ff = SingletonFastForward()
     bundle_coin_spends = singleton_ff.process_fast_forward_spends(
-        mempool_item=internal_mempool_item, height=TEST_HEIGHT, constants=DEFAULT_CONSTANTS
+        mempool_item=internal_mempool_item, prev_tx_height=TEST_HEIGHT, constants=DEFAULT_CONSTANTS
     )
     assert singleton_ff == SingletonFastForward()
     assert bundle_coin_spends == original_version.bundle_coin_spends
@@ -91,7 +91,7 @@ def test_process_fast_forward_spends_latest_unspent() -> None:
     original_version = dataclasses.replace(internal_mempool_item)
     singleton_ff = SingletonFastForward()
     bundle_coin_spends = singleton_ff.process_fast_forward_spends(
-        mempool_item=internal_mempool_item, height=TEST_HEIGHT, constants=DEFAULT_CONSTANTS
+        mempool_item=internal_mempool_item, prev_tx_height=TEST_HEIGHT, constants=DEFAULT_CONSTANTS
     )
     child_coin = item.bundle_coin_spends[test_coin.name()].additions[0]
     expected_fast_forward_spends = {
@@ -199,10 +199,10 @@ async def make_and_send_spend_bundle(
     is_eligible_for_ff: bool = True,
     *,
     is_launcher_coin: bool = False,
-    signing_puzzle: Optional[Program] = None,
-    signing_coin: Optional[Coin] = None,
+    signing_puzzle: Program | None = None,
+    signing_coin: Coin | None = None,
     aggsig: G2Element = G2Element(),
-) -> tuple[MempoolInclusionStatus, Optional[Err]]:
+) -> tuple[MempoolInclusionStatus, Err | None]:
     if is_launcher_coin or not is_eligible_for_ff:
         assert signing_puzzle is not None
         assert signing_coin is not None

chia/_tests/core/server/serve.py

@@ -7,7 +7,7 @@ import logging.config
 import pathlib
 import sys
 import threading
-from typing import Optional, final, overload
+from typing import final, overload
 
 from chia._tests.util.misc import create_logger
 from chia.server.chia_policy import ChiaPolicy
@@ -47,7 +47,7 @@ async def async_main(
     shutdown_path: pathlib.Path,
     ip: str = "127.0.0.1",
     port: int = 8444,
-    port_holder: Optional[list[int]] = None,
+    port_holder: list[int] | None = None,
 ) -> None: ...
 
 
@@ -58,22 +58,22 @@ async def async_main(
     thread_end_event: threading.Event,
     ip: str = "127.0.0.1",
     port: int = 8444,
-    port_holder: Optional[list[int]] = None,
+    port_holder: list[int] | None = None,
 ) -> None: ...
 
 
 async def async_main(
     *,
     out_path: pathlib.Path,
-    shutdown_path: Optional[pathlib.Path] = None,
-    thread_end_event: Optional[threading.Event] = None,
+    shutdown_path: pathlib.Path | None = None,
+    thread_end_event: threading.Event | None = None,
     ip: str = "127.0.0.1",
     port: int = 8444,
-    port_holder: Optional[list[int]] = None,
+    port_holder: list[int] | None = None,
 ) -> None:
     with out_path.open(mode="w") as file:
         logger = create_logger(file=file)
-        file_task: Optional[asyncio.Task[None]] = None
+        file_task: asyncio.Task[None] | None = None
         if thread_end_event is None:
             assert shutdown_path is not None
             thread_end_event = threading.Event()

chia/_tests/core/server/test_dos.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 import logging
 import time
-from typing import Optional
 
 import pytest
 from aiohttp import ClientSession, ClientTimeout, WSCloseCode, WSMessage, WSMsgType, WSServerHandshakeError
@@ -36,7 +35,7 @@ def not_localhost(host: str) -> bool:
 class FakeRateLimiter:
     def process_msg_and_check(
         self, message: Message, our_capabilities: list[Capability], peer_capabilities: list[Capability]
-    ) -> Optional[str]:
+    ) -> str | None:
         return None
 
 

chia/_tests/core/server/test_event_loop.py

@@ -30,7 +30,9 @@ def test_base_event_loop_has_methods() -> None:
         assert hasattr(base_selector_event_loop, "create_server")
         method = getattr(base_selector_event_loop, "create_server")
         assert inspect.ismethod(method)
-        if sys.version_info >= (3, 11):
+        if sys.version_info >= (3, 13):
+            expected_signature = "(protocol_factory, host=None, port=None, *, family=<AddressFamily.AF_UNSPEC: 0>, flags=<AddressInfo.AI_PASSIVE: 1>, sock=None, backlog=100, ssl=None, reuse_address=None, reuse_port=None, keep_alive=None, ssl_handshake_timeout=None, ssl_shutdown_timeout=None, start_serving=True)"  # noqa: E501
+        elif sys.version_info >= (3, 11):
             expected_signature = "(protocol_factory, host=None, port=None, *, family=<AddressFamily.AF_UNSPEC: 0>, flags=<AddressInfo.AI_PASSIVE: 1>, sock=None, backlog=100, ssl=None, reuse_address=None, reuse_port=None, ssl_handshake_timeout=None, ssl_shutdown_timeout=None, start_serving=True)"  # noqa: E501
         else:
             expected_signature = "(protocol_factory, host=None, port=None, *, family=<AddressFamily.AF_UNSPEC: 0>, flags=<AddressInfo.AI_PASSIVE: 1>, sock=None, backlog=100, ssl=None, reuse_address=None, reuse_port=None, ssl_handshake_timeout=None, start_serving=True)"  # noqa: E501
@@ -62,7 +64,7 @@ def test_base_event_loop_has_methods() -> None:
         )
 
         assert inspect.isfunction(_chia_create_server)
-        expected_signature = "(cls: 'Any', protocol_factory: '_ProtocolFactory', host: 'Any', port: 'Any', *, family: 'socket.AddressFamily' = <AddressFamily.AF_UNSPEC: 0>, flags: 'socket.AddressInfo' = <AddressInfo.AI_PASSIVE: 1>, sock: 'Any' = None, backlog: 'int' = 100, ssl: '_SSLContext' = None, reuse_address: 'Optional[bool]' = None, reuse_port: 'Optional[bool]' = None, ssl_handshake_timeout: 'Optional[float]' = 30, start_serving: 'bool' = True) -> 'PausableServer'"  # noqa: E501
+        expected_signature = "(cls: 'Any', protocol_factory: '_ProtocolFactory', host: 'Any', port: 'Any', *, family: 'socket.AddressFamily' = <AddressFamily.AF_UNSPEC: 0>, flags: 'socket.AddressInfo' = <AddressInfo.AI_PASSIVE: 1>, sock: 'Any' = None, backlog: 'int' = 100, ssl: '_SSLContext' = None, reuse_address: 'bool | None' = None, reuse_port: 'bool | None' = None, ssl_handshake_timeout: 'float | None' = 30, start_serving: 'bool' = True) -> 'PausableServer'"  # noqa: E501
         assert str(inspect.signature(_chia_create_server)) == expected_signature
 
         class EchoProtocol(asyncio.Protocol):
@@ -103,7 +105,13 @@ def test_base_event_loop_has_methods() -> None:
 
         for func in ("_attach", "_detach"):
             assert hasattr(base_server, func)
-            method = getattr(base_server, func)
-            assert str(inspect.signature(method)) == "()"
+            if sys.version_info >= (3, 13):
+                # https://github.com/python/cpython/blob/bcee1c322115c581da27600f2ae55e5439c027eb/Lib/asyncio/base_events.py#L296
+                method = getattr(base_server, func)
+                assert str(inspect.signature(method)) == "(transport)"
+            else:
+                method = getattr(base_server, func)
+                assert str(inspect.signature(method)) == "()"
+
     finally:
         selector_event_loop.close()

chia/_tests/core/server/test_loop.py

@@ -10,7 +10,6 @@ import sys
 import threading
 from collections.abc import AsyncIterator
 from dataclasses import dataclass, field
-from typing import Optional
 
 import anyio
 import pytest
@@ -45,8 +44,8 @@ async def serve_in_thread(
 
 @dataclass
 class Client:
-    reader: Optional[asyncio.StreamReader]
-    writer: Optional[asyncio.StreamWriter]
+    reader: asyncio.StreamReader | None
+    writer: asyncio.StreamWriter | None
 
     @classmethod
     async def open(cls, ip: str, port: int) -> Client:
@@ -95,10 +94,10 @@ class ServeInThread:
     requested_port: int
     out_path: pathlib.Path
     connection_limit: int = 25
-    original_connection_limit: Optional[int] = None
-    loop: Optional[asyncio.AbstractEventLoop] = None
-    server_task: Optional[asyncio.Task[None]] = None
-    thread: Optional[threading.Thread] = None
+    original_connection_limit: int | None = None
+    loop: asyncio.AbstractEventLoop | None = None
+    server_task: asyncio.Task[None] | None = None
+    thread: threading.Thread | None = None
     thread_end_event: threading.Event = field(default_factory=threading.Event)
     port_holder: list[int] = field(default_factory=list)
 
@@ -189,7 +188,7 @@ async def test_loop(tmp_path: pathlib.Path) -> None:
         await asyncio.sleep(adjusted_timeout(5))
 
         writer = None
-        post_connection_error: Optional[str] = None
+        post_connection_error: str | None = None
         try:
             logger.info(" ==== attempting a single new connection")
             with anyio.fail_after(delay=adjusted_timeout(1)):

chia/_tests/core/server/test_rate_limits.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Union
 
 import pytest
 from chia_rs.sized_ints import uint32
@@ -24,7 +23,6 @@ from chia.types.peer_info import PeerInfo
 rl_v2 = [Capability.BASE, Capability.BLOCK_HEADERS, Capability.RATE_LIMITS_V2]
 rl_v1 = [Capability.BASE]
 node_with_params_b = node_with_params
-test_different_versions_results: list[int] = []
 
 
 @dataclass
@@ -66,7 +64,7 @@ async def test_limits_v2(incoming: bool, tx_msg: bool, limit_size: bool, monkeyp
     message_data = b"\0" * 1024
     msg_type = ProtocolMessageTypes.new_transaction
 
-    limits: dict[ProtocolMessageTypes, Union[RLSettings, Unlimited]]
+    limits: dict[ProtocolMessageTypes, RLSettings | Unlimited]
 
     if limit_size:
         agg_limit = RLSettings(False, count * 2, len(message_data), count * len(message_data))
@@ -80,7 +78,7 @@ async def test_limits_v2(incoming: bool, tx_msg: bool, limit_size: bool, monkeyp
 
     def mock_get_limits(
         our_capabilities: list[Capability], peer_capabilities: list[Capability]
-    ) -> tuple[dict[ProtocolMessageTypes, Union[RLSettings, Unlimited]], RLSettings]:
+    ) -> tuple[dict[ProtocolMessageTypes, RLSettings | Unlimited], RLSettings]:
         return limits, agg_limit
 
     import chia.server.rate_limits
@@ -418,11 +416,14 @@ async def test_different_versions(
     # The following code checks whether all of the runs resulted in the same number of items in "rate_limits_tx",
     # which would mean the same rate limits are always used. This should not happen, since two nodes with V2
     # will use V2.
-    total_tx_msg_count = len(get_rate_limits_to_use(a_con.local_capabilities, a_con.peer_capabilities))
+    rate_limits = get_rate_limits_to_use(a_con.local_capabilities, a_con.peer_capabilities)[0]
+    limit = rate_limits[ProtocolMessageTypes.request_header_blocks]
+    assert isinstance(limit, RLSettings)
 
-    test_different_versions_results.append(total_tx_msg_count)
-    if len(test_different_versions_results) >= 4:
-        assert len(set(test_different_versions_results)) >= 2
+    if Capability.RATE_LIMITS_V2 in a_con.local_capabilities and Capability.RATE_LIMITS_V2 in a_con.peer_capabilities:
+        assert limit.frequency == 5000
+    else:
+        assert limit.frequency == 500
 
 
 @pytest.mark.anyio

chia/_tests/core/server/test_server.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, ClassVar, cast
+from typing import ClassVar, cast
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -10,6 +11,7 @@ from chia_rs.sized_ints import int16, uint32
 from packaging.version import Version
 
 from chia import __version__
+from chia._tests.conftest import ConsensusMode
 from chia._tests.connection_utils import connect_and_get_peer
 from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices
 from chia._tests.util.time_out_assert import time_out_assert
@@ -22,6 +24,7 @@ from chia.protocols.shared_protocol import Error, protocol_version
 from chia.protocols.wallet_protocol import RejectHeaderRequest
 from chia.server.api_protocol import ApiMetadata
 from chia.server.server import ChiaServer
+from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
 from chia.server.ws_connection import WSChiaConnection, error_response_version
 from chia.simulator.block_tools import BlockTools
 from chia.types.peer_info import PeerInfo
@@ -224,3 +227,60 @@ async def test_get_peer_info(bt: BlockTools) -> None:
     node_service = await create_full_node_service(bt.root_path, bt.config, bt.constants, connect_to_daemon=False)
     local_port = node_service._server.get_port()
     assert local_port is not None
+
+
+class FakeConnection:
+    connection_type: NodeType = NodeType.FULL_NODE
+    peer_node_id: bytes32 = bytes32(b"\x00" * 32)
+
+    def __init__(self, peer_info: PeerInfo) -> None:
+        self.peer_info = peer_info
+
+    def cancel_tasks(self) -> None:
+        pass
+
+
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="save time")
+@pytest.mark.anyio
+async def test_connection_closed_banning(bt: BlockTools, caplog: pytest.LogCaptureFixture) -> None:
+    test_config = bt.config["full_node"]
+    private_ca_crt, private_ca_key = private_ssl_ca_paths(bt.root_path, bt.config)
+    chia_ca_crt, chia_ca_key = chia_ssl_ca_paths(bt.root_path, bt.config)
+
+    # need to add in exempt networks to config
+    test_config["exempt_peer_networks"] = ["10.1.1.0/16"]
+    test_config["trusted_cidrs"] = ["34.34.34.34/32"]
+
+    my_test_server = ChiaServer.create(
+        port=None,
+        node=None,
+        api=FullNodeAPI(None),  # type: ignore[arg-type]
+        local_type=NodeType.FULL_NODE,
+        ping_interval=0,
+        network_id="Fake",
+        root_path=bt.root_path,
+        capabilities=[],
+        outbound_rate_limit_percent=100,
+        inbound_rate_limit_percent=100,
+        config=test_config,
+        private_ca_crt_key=(private_ca_crt, private_ca_key),
+        chia_ca_crt_key=(chia_ca_crt, chia_ca_key),
+        stub_metadata_for_type={},
+        name="Hello",
+    )
+
+    with caplog.at_level(logging.WARNING):
+        # testing exempt_peer_networks
+        exempt_peer = FakeConnection(peer_info=PeerInfo("10.1.1.1", 8444))
+        await my_test_server.connection_closed(cast(WSChiaConnection, exempt_peer), ban_time=60)
+        assert f"Trying to ban exempt peer {exempt_peer.peer_info.host} for 60, but will not ban" in caplog.text
+
+        # testing localhost exemption
+        localhost_peer = FakeConnection(peer_info=PeerInfo("127.0.0.1", 8444))
+        await my_test_server.connection_closed(cast(WSChiaConnection, localhost_peer), ban_time=60)
+        assert "Trying to ban localhost for 60, but will not ban" in caplog.text
+
+        # testing trusted peers exemption
+        trusted_peer = FakeConnection(peer_info=PeerInfo("34.34.34.34", 8444))
+        await my_test_server.connection_closed(cast(WSChiaConnection, trusted_peer), ban_time=60)
+        assert f"Trying to ban trusted peer {trusted_peer.peer_info.host} for 60, but will not ban" in caplog.text

chia/_tests/core/services/test_services.py

@@ -7,7 +7,7 @@ import sys
 import time
 from collections.abc import AsyncIterator
 from pathlib import Path
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import aiohttp.client_exceptions
 import pytest
@@ -114,7 +114,7 @@ async def test_daemon_terminates(signal_number: signal.Signals, chia_root: ChiaR
 async def test_services_terminate(
     signal_number: signal.Signals,
     chia_root: ChiaRoot,
-    create_service: Optional[CreateServiceProtocol],
+    create_service: CreateServiceProtocol | None,
     module_path: str,
     service_config_name: str,
 ) -> None:

chia/_tests/core/ssl/test_ssl.py

@@ -9,7 +9,7 @@ import aiohttp
 import pytest
 from chia_rs.sized_bytes import bytes32
 
-from chia.apis import ApiProtocolRegistry
+from chia.apis import StubMetadataRegistry
 from chia.protocols.outbound_message import NodeType
 from chia.protocols.shared_protocol import default_capabilities
 from chia.server.server import ChiaServer, ssl_context_for_client
@@ -38,7 +38,7 @@ async def establish_connection(server: ChiaServer, self_hostname: str, ssl_conte
             100,
             30,
             local_capabilities_for_handshake=default_capabilities[NodeType.FULL_NODE],
-            class_for_type=ApiProtocolRegistry,
+            stub_metadata_for_type=StubMetadataRegistry,
         )
         await wsc.perform_handshake(server._network_id, dummy_port, NodeType.FULL_NODE)
         await wsc.close()

chia/_tests/core/test_cost_calculation.py

@@ -58,9 +58,7 @@ async def test_basics(softfork_height: int, bt: BlockTools) -> None:
     wallet_tool = bt.get_pool_wallet_tool()
     ph = wallet_tool.get_new_puzzlehash()
     num_blocks = 3
-    blocks = bt.get_consecutive_blocks(
-        num_blocks, [], guarantee_transaction_block=True, pool_reward_puzzle_hash=ph, farmer_reward_puzzle_hash=ph
-    )
+    blocks = bt.get_consecutive_blocks(num_blocks, [], guarantee_transaction_block=True, farmer_reward_puzzle_hash=ph)
     coinbase = None
     for coin in blocks[2].get_included_reward_coins():
         if coin.puzzle_hash == ph and coin.amount == 250000000000:
@@ -124,9 +122,7 @@ async def test_mempool_mode(softfork_height: int, bt: BlockTools) -> None:
     ph = wallet_tool.get_new_puzzlehash()
 
     num_blocks = 3
-    blocks = bt.get_consecutive_blocks(
-        num_blocks, [], guarantee_transaction_block=True, pool_reward_puzzle_hash=ph, farmer_reward_puzzle_hash=ph
-    )
+    blocks = bt.get_consecutive_blocks(num_blocks, [], guarantee_transaction_block=True, farmer_reward_puzzle_hash=ph)
 
     coinbase = None
     for coin in blocks[2].get_included_reward_coins():

chia/_tests/core/test_farmer_harvester_rpc.py

@@ -3,14 +3,13 @@ from __future__ import annotations
 import dataclasses
 import logging
 import operator
-import sys
 import time
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from math import ceil
 from os import mkdir
 from pathlib import Path
 from shutil import copy
-from typing import Any, Callable, Union, cast
+from typing import Any, cast
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -360,11 +359,10 @@ def test_plot_matches_filter(filter_item: FilterItem, match: bool) -> None:
     ],
 )
 @pytest.mark.anyio
-@pytest.mark.skipif(sys.platform == "win32", reason="avoiding crashes on windows until we fix this (crashing workers)")
 async def test_farmer_get_harvester_plots_endpoints(
     harvester_farmer_environment: HarvesterFarmerEnvironment,
     endpoint: Callable[[FarmerRpcClient, PaginatedRequestData], Awaitable[dict[str, Any]]],
-    filtering: Union[list[FilterItem], list[str]],
+    filtering: list[FilterItem] | list[str],
     sort_key: str,
     reverse: bool,
     expected_plot_count: int,

chia/_tests/core/test_filter.py

@@ -19,7 +19,6 @@ async def test_basic_filter_test(simulator_and_wallet):
         10,
         guarantee_transaction_block=True,
         farmer_reward_puzzle_hash=ph,
-        pool_reward_puzzle_hash=ph,
     )
     for i in range(1, num_blocks):
         byte_array_tx: list[bytes] = []

chia/_tests/core/test_full_node_rpc.py

@@ -9,6 +9,7 @@ from chia import __version__
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.conftest import ConsensusMode
 from chia._tests.connection_utils import connect_and_get_peer
+from chia._tests.core.full_node.test_full_node import find_reward_coin
 from chia._tests.util.rpc import validate_get_routes
 from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices
 from chia._tests.util.time_out_assert import time_out_assert
@@ -763,7 +764,6 @@ async def test_coin_name_found_in_mempool(one_node: SimulatorsAndWalletsServices
             block_list_input=blocks,
             guarantee_transaction_block=True,
             farmer_reward_puzzle_hash=ph,
-            pool_reward_puzzle_hash=ph,
         )
         for block in blocks[-2:]:
             await full_node_api.full_node.add_block(block)
@@ -771,7 +771,7 @@ async def test_coin_name_found_in_mempool(one_node: SimulatorsAndWalletsServices
         # empty mempool
         assert len(await client.get_all_mempool_items()) == 0
 
-        coin_to_spend = blocks[-1].get_included_reward_coins()[0]
+        coin_to_spend = find_reward_coin(blocks[-1], ph)
         spend_bundle = wallet.generate_signed_transaction(coin_to_spend.amount, ph_receiver, coin_to_spend)
         await client.push_tx(spend_bundle)
 

chia/_tests/core/test_merkle_set.py

@@ -5,7 +5,6 @@ import random
 from hashlib import sha256
 from itertools import permutations
 from random import Random
-from typing import Optional
 
 import pytest
 from chia_rs import Coin, MerkleSet, compute_merkle_set_root, confirm_included_already_hashed
@@ -311,7 +310,7 @@ def test_validate_removals_full_list(num_coins: int, seeded_random: Random) -> N
     # the root can be computed by all the removals
     coins = make_test_coins(num_coins, seeded_random)
 
-    coin_map: list[tuple[bytes32, Optional[Coin]]] = []
+    coin_map: list[tuple[bytes32, Coin | None]] = []
     removals_merkle_set = MerkleSet([coin.name() for coin in coins])
     for coin in coins:
         coin_map.append((coin.name(), coin))

chia/_tests/core/test_seeder.py

@@ -4,7 +4,7 @@ import time
 from dataclasses import dataclass
 from ipaddress import IPv4Address, IPv6Address
 from socket import AF_INET, AF_INET6, SOCK_STREAM
-from typing import Optional, Union, cast
+from typing import cast
 from unittest.mock import AsyncMock
 
 import dns
@@ -367,9 +367,9 @@ def get_mock_resolver() -> AsyncMock:
 
     # Adjust mock_resolve to accept all arguments
     async def mock_resolve(
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        lifetime: Optional[float] = None,
+        qname: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+        lifetime: float | None = None,
     ) -> RRset:
         if rdtype == "A":
             return mock_rrset_a

chia/_tests/core/util/test_config.py

@@ -10,7 +10,7 @@ from multiprocessing import Pool, Queue, TimeoutError
 from pathlib import Path
 from threading import Thread
 from time import sleep
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 import yaml
@@ -41,7 +41,7 @@ def write_config(
     atomic_write: bool,
     do_sleep: bool,
     iterations: int,
-    error_queue: Optional[Queue] = None,
+    error_queue: Queue | None = None,
 ):
     """
     Wait for a random amount of time and write out the config data. With a large
@@ -74,7 +74,7 @@ def write_config(
 
 
 def read_and_compare_config(
-    root_path: Path, default_config: dict, do_sleep: bool, iterations: int, error_queue: Optional[Queue] = None
+    root_path: Path, default_config: dict, do_sleep: bool, iterations: int, error_queue: Queue | None = None
 ):
     """
     Wait for a random amount of time, read the config and compare with the
@@ -263,7 +263,7 @@ class TestConfig:
         Test whether multiple readers/writers encounter data corruption. When using non-atomic operations
         to write to the config, partial/incomplete writes can cause readers to yield bad/corrupt data.
         """
-        # Artifically inflate the size of the default config. This is done to (hopefully) force
+        # Artificially inflate the size of the default config. This is done to (hopefully) force
         # save_config() to require multiple writes. When save_config() was using shutil.move()
         # multiple writes were observed, leading to read failures when data was partially written.
         default_config_dict["xyz"] = "x" * 32768

chia/_tests/core/util/test_jsonify.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
@@ -18,7 +18,7 @@ def test_primitives() -> None:
     @dataclass(frozen=True)
     class PrimitivesTest(Streamable):
         a: uint32
-        b: Optional[str]
+        b: str | None
         c: str
         d: bytes
         e: bytes32

chia/_tests/core/util/test_keychain.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import json
 import random
+from collections.abc import Callable
 from dataclasses import dataclass, replace
-from typing import Callable, Optional
 
 import importlib_resources
 import pytest
@@ -271,7 +271,7 @@ def test_key_data_secrets_creation(
 
 
 @pytest.mark.parametrize("label", [None, "key"])
-def test_key_data_generate(label: Optional[str]) -> None:
+def test_key_data_generate(label: str | None) -> None:
     key_data = KeyData.generate(label)
     assert key_data.private_key == AugSchemeMPL.key_gen(mnemonic_to_seed(key_data.mnemonic_str()))
     assert key_data.entropy == bytes_from_mnemonic(key_data.mnemonic_str())
@@ -343,7 +343,7 @@ def test_key_data_secrets_post_init(input_data: tuple[list[str], bytes, PrivateK
     ],
 )
 def test_key_data_post_init(
-    input_data: tuple[uint32, G1Element, Optional[str], Optional[KeyDataSecrets]], data_type: str
+    input_data: tuple[uint32, G1Element, str | None, KeyDataSecrets | None], data_type: str
 ) -> None:
     with pytest.raises(KeychainKeyDataMismatch, match=data_type):
         KeyData(*input_data)

chia/_tests/core/util/test_lockfile.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 import logging
 import os
 import time
+from collections.abc import Callable
 from multiprocessing import Pool, TimeoutError
 from pathlib import Path
 from sys import platform
 from time import sleep
-from typing import Any, Callable
+from typing import Any
 
 import pytest
 

chia/_tests/core/util/test_log_exceptions.py

@@ -4,7 +4,6 @@ import contextlib
 import dataclasses
 import logging
 import re
-from typing import Union
 
 import pytest
 
@@ -22,7 +21,7 @@ def logger_fixture() -> logging.Logger:
 @dataclasses.dataclass
 class ErrorCase:
     type_to_raise: type[BaseException]
-    type_to_catch: Union[type[BaseException], tuple[type[BaseException], ...]]
+    type_to_catch: type[BaseException] | tuple[type[BaseException], ...]
     should_match: bool