chia-blockchain 2.5.0rc2__py3-none-any.whl → 2.5.1rc2__py3-none-any.whl

chia/_tests/util/test_network_protocol_test.py

@@ -1,9 +1,8 @@
-# flake8: noqa
 from __future__ import annotations
 
 import ast
 import inspect
-from typing import Any, Dict, Set, cast
+from typing import Any, cast
 
 from chia.protocols import (
     farmer_protocol,
@@ -21,7 +20,7 @@ from chia.protocols import (
 # stays up to date. It's a test for the test
 
 
-def types_in_module(mod: Any) -> Set[str]:
+def types_in_module(mod: Any) -> set[str]:
     parsed = ast.parse(inspect.getsource(mod))
     types = set()
     for line in parsed.body:
@@ -34,23 +33,22 @@ def types_in_module(mod: Any) -> Set[str]:
     return types
 
 
+STANDARD_ADVICE = "Make sure to update the protocol message regression test to include the new message"
+
+
 def test_missing_messages_state_machine() -> None:
     from chia.protocols.protocol_state_machine import NO_REPLY_EXPECTED, VALID_REPLY_MESSAGE_MAP
 
     # if these asserts fail, make sure to add the new network protocol messages
     # to the visitor in build_network_protocol_files.py and rerun it. Then
     # update this test
-    assert (
-        len(VALID_REPLY_MESSAGE_MAP) == 26
-    ), "A message was added to the protocol state machine. Make sure to update the protocol message regression test to include the new message"
-    assert (
-        len(NO_REPLY_EXPECTED) == 10
-    ), "A message was added to the protocol state machine. Make sure to update the protocol message regression test to include the new message"
+    assert len(VALID_REPLY_MESSAGE_MAP) == 26, f"A message was added to the protocol state machine. {STANDARD_ADVICE}"
+    assert len(NO_REPLY_EXPECTED) == 10, f"A message was added to the protocol state machine. {STANDARD_ADVICE}"
 
 
 def test_message_ids() -> None:
     parsed = ast.parse(inspect.getsource(protocol_message_types))
-    message_ids: Dict[int, str] = {}
+    message_ids: dict[int, str] = {}
     for line in parsed.body:
         if not isinstance(line, ast.ClassDef) or line.name != "ProtocolMessageTypes":
             continue
@@ -63,7 +61,8 @@ def test_message_ids() -> None:
             message_name = entry.targets[0].id
             if message_id in message_ids:  # pragma: no cover
                 raise AssertionError(
-                    f'protocol message ID clash between "{message_name}" and "{message_ids[message_id]}". Value {message_id}'
+                    f'protocol message ID clash between "{message_name}" and "{message_ids[message_id]}". '
+                    f"Value {message_id}"
                 )
             message_ids[message_id] = message_name
             if message_id < 0 or message_id > 255:  # pragma: no cover
@@ -226,32 +225,32 @@ def test_missing_messages() -> None:
     # update this test
     assert (
         types_in_module(wallet_protocol) == wallet_msgs
-    ), "message types were added or removed from wallet_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from wallet_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(farmer_protocol) == farmer_msgs
-    ), "message types were added or removed from farmer_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from farmer_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(full_node_protocol) == full_node_msgs
-    ), "message types were added or removed from full_node_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from full_node_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(harvester_protocol) == harvester_msgs
-    ), "message types were added or removed from harvester_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from harvester_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(introducer_protocol) == introducer_msgs
-    ), "message types were added or removed from introducer_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from introducer_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(pool_protocol) == pool_msgs
-    ), "message types were added or removed from pool_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from pool_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(timelord_protocol) == timelord_msgs
-    ), "message types were added or removed from timelord_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from timelord_protocol. {STANDARD_ADVICE}"
 
     assert (
         types_in_module(shared_protocol) == shared_msgs
-    ), "message types were added or removed from shared_protocol. Make sure to update the protocol message regression test to include the new message"
+    ), f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"

chia/_tests/util/test_paginator.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from math import ceil
-from typing import List, Type
 
 import pytest
 
@@ -12,7 +11,7 @@ from chia.util.paginator import InvalidPageSizeError, InvalidPageSizeLimit, Page
     "source, page_size, page_size_limit",
     [([], 1, 1), ([1], 1, 2), ([1, 2], 2, 2), ([], 10, 100), ([1, 2, 10], 1000, 1000)],
 )
-def test_constructor_valid_inputs(source: List[int], page_size: int, page_size_limit: int) -> None:
+def test_constructor_valid_inputs(source: list[int], page_size: int, page_size_limit: int) -> None:
     paginator: Paginator = Paginator.create(source, page_size, page_size_limit)
     assert paginator.page_size() == page_size
     assert paginator.page_count() == 1
@@ -29,7 +28,7 @@ def test_constructor_valid_inputs(source: List[int], page_size: int, page_size_l
         (1001, 1000, InvalidPageSizeError),
     ],
 )
-def test_constructor_invalid_inputs(page_size: int, page_size_limit: int, exception: Type[Exception]) -> None:
+def test_constructor_invalid_inputs(page_size: int, page_size_limit: int, exception: type[Exception]) -> None:
     with pytest.raises(exception):
         Paginator.create([], page_size, page_size_limit)
 
@@ -62,7 +61,7 @@ def test_page_count() -> None:
         (0, 10, 0, []),
     ],
 )
-def test_get_page_valid(length: int, page: int, page_size: int, expected_data: List[int]) -> None:
+def test_get_page_valid(length: int, page: int, page_size: int, expected_data: list[int]) -> None:
     assert Paginator.create(list(range(0, length)), page_size).get_page(page) == expected_data
 
 

chia/_tests/util/test_pprint.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from chia.util.pprint import print_compact_ranges
+from chia.wallet.util.pprint import print_compact_ranges
 
 
 def test_print_compact_ranges() -> None:

chia/_tests/util/test_priority_mutex.py

@@ -8,7 +8,7 @@ import logging
 import random
 import time
 from dataclasses import dataclass
-from typing import Callable, List, Optional
+from typing import Callable, Optional
 
 import anyio
 import pytest
@@ -16,6 +16,7 @@ import pytest
 from chia._tests.util.misc import Marks, datacases
 from chia._tests.util.time_out_assert import time_out_assert_custom_interval
 from chia.util.priority_mutex import NestedLockUnsupportedError, PriorityMutex
+from chia.util.task_referencer import create_referenced_task
 from chia.util.timing import adjusted_timeout
 
 log = logging.getLogger(__name__)
@@ -65,10 +66,10 @@ class TestPriorityMutex:
                 log.warning(f"Spend {time.time() - t1} waiting for low {i}")
                 await kind_of_slow_func()
 
-        h = asyncio.create_task(do_high())
+        h = create_referenced_task(do_high())
         l_tasks = []
         for i in range(50):
-            l_tasks.append(asyncio.create_task(do_low(i)))
+            l_tasks.append(create_referenced_task(do_low(i)))
 
         winner = None
 
@@ -158,8 +159,8 @@ class Request:
 
 @dataclass(frozen=True)
 class OrderCase:
-    requests: List[Request]
-    expected_acquisitions: List[str]
+    requests: list[Request]
+    expected_acquisitions: list[str]
 
 
 @dataclass
@@ -268,7 +269,7 @@ async def test_order(case: OrderCase) -> None:
     assert sane(requests=case.requests)
 
 
-def expected_acquisition_order(requests: List[Request]) -> List[Request]:
+def expected_acquisition_order(requests: list[Request]) -> list[Request]:
     first_request, *other_requests = requests
     return [
         first_request,
@@ -334,13 +335,13 @@ async def test_cancellation_while_waiting() -> None:
         async with mutex.acquire(priority=MutexPriority.high):
             pass
 
-    block_task = asyncio.create_task(block())
+    block_task = create_referenced_task(block())
     await blocker_acquired_event.wait()
 
-    cancel_task = asyncio.create_task(to_be_cancelled(mutex=mutex))
+    cancel_task = create_referenced_task(to_be_cancelled(mutex=mutex))
     await wait_queued(mutex=mutex, task=cancel_task)
 
-    queued_after_task = asyncio.create_task(queued_after())
+    queued_after_task = create_referenced_task(queued_after())
     await wait_queued(mutex=mutex, task=queued_after_task)
 
     cancel_task.cancel()
@@ -375,7 +376,7 @@ async def test_retains_request_order_for_matching_priority(seed: int) -> None:
     assert sane(requests=all_requests)
 
 
-def sane(requests: List[Request]) -> bool:
+def sane(requests: list[Request]) -> bool:
     if any(not request.completed for request in requests):
         return False
 
@@ -387,7 +388,7 @@ def sane(requests: List[Request]) -> bool:
 class SaneCase:
     id: str
     good: bool
-    requests: List[Request]
+    requests: list[Request]
     marks: Marks = ()
 
 
@@ -434,14 +435,14 @@ def test_sane_all_in_order(case: SaneCase) -> None:
 
 
 async def create_acquire_tasks_in_controlled_order(
-    requests: List[Request],
+    requests: list[Request],
     mutex: PriorityMutex[MutexPriority],
-) -> List[asyncio.Task[None]]:
-    tasks: List[asyncio.Task[None]] = []
+) -> list[asyncio.Task[None]]:
+    tasks: list[asyncio.Task[None]] = []
     release_event = asyncio.Event()
 
     for request in requests:
-        task = asyncio.create_task(request.acquire(mutex=mutex, wait_for=release_event))
+        task = create_referenced_task(request.acquire(mutex=mutex, wait_for=release_event))
         tasks.append(task)
         await wait_queued(mutex=mutex, task=task)
 
@@ -461,14 +462,14 @@ async def test_multiple_tasks_track_active_task_accurately() -> None:
             await other_task_allow_release_event.wait()
 
     async with mutex.acquire(priority=MutexPriority.high):
-        other_task = asyncio.create_task(other_task_function())
+        other_task = create_referenced_task(other_task_function())
         await wait_queued(mutex=mutex, task=other_task)
 
     async def another_task_function() -> None:
         async with mutex.acquire(priority=MutexPriority.high):
             pass
 
-    another_task = asyncio.create_task(another_task_function())
+    another_task = create_referenced_task(another_task_function())
     await wait_queued(mutex=mutex, task=another_task)
     other_task_allow_release_event.set()
 

chia/_tests/util/test_recursive_replace.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copy
 from dataclasses import dataclass
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 import pytest
 
@@ -35,7 +35,7 @@ class TestC:
 class TestA:
     a: int
     b: str
-    c: List[int]
+    c: list[int]
     d: Optional[TestC]
 
 

chia/_tests/util/test_testnet_overrides.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Any
 
 from chia.consensus.default_constants import update_testnet_overrides
 
 
 def test_testnet11() -> None:
-    overrides: Dict[str, Any] = {}
+    overrides: dict[str, Any] = {}
     update_testnet_overrides("testnet11", overrides)
     assert overrides == {
         "SOFT_FORK6_HEIGHT": 2000000,
@@ -14,6 +14,6 @@ def test_testnet11() -> None:
 
 
 def test_mainnet() -> None:
-    overrides: Dict[str, Any] = {}
+    overrides: dict[str, Any] = {}
     update_testnet_overrides("mainnet", overrides)
     assert overrides == {}

chia/_tests/util/test_timing.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Iterator
+from collections.abc import Iterator
 
 from chia.util.timing import backoff_times
 

chia/_tests/util/test_trusted_peer.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Dict, List
+from typing import Any
 
 import pytest
 
@@ -41,7 +41,7 @@ from chia.util.network import is_trusted_peer
     ],
 )
 def test_is_trusted_peer(
-    host: str, node_id: bytes32, trusted_peers: Dict[str, Any], trusted_cidrs: List[str], testing: bool, result: bool
+    host: str, node_id: bytes32, trusted_peers: dict[str, Any], trusted_cidrs: list[str], testing: bool, result: bool
 ) -> None:
     assert (
         is_trusted_peer(

chia/_tests/util/time_out_assert.py

@@ -6,18 +6,41 @@ import json
 import logging
 import pathlib
 import time
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, Tuple, cast, final
+from collections.abc import Iterable
+from inspect import getframeinfo, stack
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Protocol, TypeVar, cast, final
 
 import chia
 import chia._tests
 from chia._tests import ether
-from chia._tests.util.misc import DataTypeProtocol, caller_file_and_line
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.util.timing import adjusted_timeout
 
 log = logging.getLogger(__name__)
 
 
+T = TypeVar("T")
+
+
+@dataclasses.dataclass(frozen=True)
+class DataTypeProtocol(Protocol):
+    tag: ClassVar[str]
+
+    line: int
+    path: Path
+    label: str
+    duration: float
+    limit: float
+
+    __match_args__: ClassVar[tuple[str, ...]] = ()
+
+    @classmethod
+    def unmarshal(cls: type[T], marshalled: dict[str, Any]) -> T: ...
+
+    def marshal(self) -> dict[str, Any]: ...
+
+
 @final
 @dataclasses.dataclass(frozen=True)
 class TimeOutAssertData:
@@ -34,10 +57,10 @@ class TimeOutAssertData:
 
     label: str = ""
 
-    __match_args__: ClassVar[Tuple[str, ...]] = ()
+    __match_args__: ClassVar[tuple[str, ...]] = ()
 
     @classmethod
-    def unmarshal(cls, marshalled: Dict[str, Any]) -> TimeOutAssertData:
+    def unmarshal(cls, marshalled: dict[str, Any]) -> TimeOutAssertData:
         return cls(
             duration=marshalled["duration"],
             path=pathlib.Path(marshalled["path"]),
@@ -46,7 +69,7 @@ class TimeOutAssertData:
             timed_out=marshalled["timed_out"],
         )
 
-    def marshal(self) -> Dict[str, Any]:
+    def marshal(self) -> dict[str, Any]:
         return {
             "duration": self.duration,
             "path": self.path.as_posix(),
@@ -102,7 +125,7 @@ async def time_out_assert_custom_interval(
                 timed_out=timed_out,
             )
 
-            ether.record_property(  # pylint: disable=E1102
+            ether.record_property(
                 data.tag,
                 json.dumps(data.marshal(), ensure_ascii=True, sort_keys=True),
             )
@@ -152,3 +175,17 @@ def time_out_messages(incoming_queue: asyncio.Queue, msg_name: str, count: int =
         return True
 
     return bool_f
+
+
+def caller_file_and_line(distance: int = 1, relative_to: Iterable[Path] = ()) -> tuple[str, int]:
+    caller = getframeinfo(stack()[distance + 1][0])
+
+    caller_path = Path(caller.filename)
+    options: list[str] = [caller_path.as_posix()]
+    for path in relative_to:
+        try:
+            options.append(caller_path.relative_to(path).as_posix())
+        except ValueError:
+            pass
+
+    return min(options, key=len), caller.lineno

chia/_tests/wallet/cat_wallet/test_cat_lifecycle.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Optional, Tuple
+from typing import Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, G2Element, PrivateKey
@@ -9,7 +9,7 @@ from clvm.casts import int_to_bytes
 from chia._tests.clvm.benchmark_costs import cost_of_spend_bundle
 from chia._tests.clvm.test_puzzles import secret_exponent_for_index
 from chia._tests.conftest import ConsensusMode
-from chia.clvm.spend_sim import CostLogger, SimClient, SpendSim, sim_and_client
+from chia._tests.util.spend_sim import CostLogger, SimClient, SpendSim, sim_and_client
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.coin_spend import make_spend
@@ -35,15 +35,15 @@ async def do_spend(
     sim: SpendSim,
     sim_client: SimClient,
     tail: Program,
-    coins: List[Coin],
-    lineage_proofs: List[LineageProof],
-    inner_solutions: List[Program],
-    expected_result: Tuple[MempoolInclusionStatus, Optional[Err]],
+    coins: list[Coin],
+    lineage_proofs: list[LineageProof],
+    inner_solutions: list[Program],
+    expected_result: tuple[MempoolInclusionStatus, Optional[Err]],
     reveal_limitations_program: bool = True,
-    signatures: List[G2Element] = [],
-    extra_deltas: Optional[List[int]] = None,
-    additional_spends: List[WalletSpendBundle] = [],
-    limitations_solutions: Optional[List[Program]] = None,
+    signatures: list[G2Element] = [],
+    extra_deltas: Optional[list[int]] = None,
+    additional_spends: list[WalletSpendBundle] = [],
+    limitations_solutions: Optional[list[Program]] = None,
     cost_logger: Optional[CostLogger] = None,
     cost_log_msg: str = "",
 ) -> int:
@@ -52,7 +52,7 @@ async def do_spend(
     if extra_deltas is None:
         extra_deltas = [0] * len(coins)
 
-    spendable_cat_list: List[SpendableCAT] = []
+    spendable_cat_list: list[SpendableCAT] = []
     for coin, innersol, proof, limitations_solution, extra_delta in zip(
         coins, inner_solutions, lineage_proofs, limitations_solutions, extra_deltas
     ):
@@ -260,8 +260,8 @@ async def test_complex_spend(cost_logger: CostLogger, consensus_mode: ConsensusM
         # Find the two new coins
         all_cats = await sim_client.get_coin_records_by_puzzle_hash(cat_ph, include_spent_coins=False)
         all_cat_coins = [cr.coin for cr in all_cats]
-        standard_to_mint = list(filter(lambda cr: cr.parent_coin_info == parent_of_mint.name(), all_cat_coins))[0]
-        standard_to_melt = list(filter(lambda cr: cr.parent_coin_info == parent_of_melt.name(), all_cat_coins))[0]
+        standard_to_mint = next(filter(lambda cr: cr.parent_coin_info == parent_of_mint.name(), all_cat_coins))
+        standard_to_melt = next(filter(lambda cr: cr.parent_coin_info == parent_of_melt.name(), all_cat_coins))
 
         # Do the complex spend
         # We have both and eve and non-eve doing both minting and melting

chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py

@@ -19,7 +19,7 @@ from chia.wallet.uncurried_puzzle import uncurry_puzzle
 
 def test_cat_outer_puzzle() -> None:
     ACS = Program.to(1)
-    tail = bytes32([0] * 32)
+    tail = bytes32.zeros
     cat_puzzle: Program = construct_cat_puzzle(CAT_MOD, tail, ACS)
     double_cat_puzzle: Program = construct_cat_puzzle(CAT_MOD, tail, cat_puzzle)
     uncurried_cat_puzzle = uncurry_puzzle(double_cat_puzzle)