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

chia/_tests/blockchain/test_blockchain_transactions.py

@@ -1,23 +1,24 @@
 from __future__ import annotations
 
 import logging
-from typing import Tuple
 
 import pytest
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.util.generator_tools_testing import run_and_get_removals_and_additions
+from chia.consensus.blockchain import AddBlockResult
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.protocols import wallet_protocol
 from chia.server.server import ChiaServer
+from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle, estimate_fees
-from chia.util.errors import ConsensusError, Err
+from chia.util.errors import Err
 from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement, AssertPuzzleAnnouncement
 
@@ -32,7 +33,7 @@ log = logging.getLogger(__name__)
 class TestBlockchainTransactions:
     @pytest.mark.anyio
     async def test_basic_blockchain_tx(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -44,8 +45,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block, None)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[2]
         spend_coin = None
@@ -98,7 +98,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_validate_blockchain_with_double_spend(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 5
         wallet_a = WALLET_A
@@ -110,8 +110,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[2]
         spend_coin = None
@@ -138,7 +137,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_validate_blockchain_duplicate_output(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 3
         wallet_a = WALLET_A
@@ -150,8 +149,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[2]
 
@@ -178,7 +176,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_validate_blockchain_with_reorg_double_spend(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -189,8 +187,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[2]
 
@@ -209,8 +206,7 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
         )
         # Move chain to height 10, with a spend at height 10
-        for block in blocks_spend:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks_spend, full_node_api_1.full_node)
 
         # Reorg at height 5, add up to and including height 12
         new_blocks = bt.get_consecutive_blocks(
@@ -221,8 +217,7 @@ class TestBlockchainTransactions:
             seed=b"another seed",
         )
 
-        for block in new_blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(new_blocks[-7:], full_node_api_1.full_node)
 
         # Spend the same coin in the new reorg chain at height 13
         new_blocks = bt.get_consecutive_blocks(
@@ -257,8 +252,9 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             seed=b"spend at 12 is ok",
         )
-        for block in new_blocks_reorg:
-            await full_node_api_1.full_node.add_block(block)
+        await _validate_and_add_block(
+            full_node_api_1.full_node.blockchain, new_blocks_reorg[-1], expected_result=AddBlockResult.ADDED_AS_ORPHAN
+        )
 
         # Spend at height 13 is also OK (same height)
         new_blocks_reorg = bt.get_consecutive_blocks(
@@ -269,8 +265,9 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             seed=b"spend at 13 is ok",
         )
-        for block in new_blocks_reorg:
-            await full_node_api_1.full_node.add_block(block)
+        await _validate_and_add_block(
+            full_node_api_1.full_node.blockchain, new_blocks_reorg[-1], expected_result=AddBlockResult.ADDED_AS_ORPHAN
+        )
 
         # Spend at height 14 is not OK (already spend)
         new_blocks_reorg = bt.get_consecutive_blocks(
@@ -281,13 +278,16 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             seed=b"spend at 14 is double spend",
         )
-        with pytest.raises(ConsensusError):
-            for block in new_blocks_reorg:
-                await full_node_api_1.full_node.add_block(block)
+        await _validate_and_add_block(
+            full_node_api_1.full_node.blockchain,
+            new_blocks_reorg[-1],
+            expected_result=AddBlockResult.INVALID_BLOCK,
+            expected_error=Err.DOUBLE_SPEND,
+        )
 
     @pytest.mark.anyio
     async def test_validate_blockchain_spend_reorg_coin(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools], softfork_height: uint32
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools], softfork_height: uint32
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -300,8 +300,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[2]
 
@@ -321,8 +320,7 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             guarantee_transaction_block=True,
         )
-
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await add_blocks_in_batches([new_blocks[-1]], full_node_api_1.full_node)
 
         coin_2 = None
         for coin in run_and_get_removals_and_additions(
@@ -346,7 +344,7 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             guarantee_transaction_block=True,
         )
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await add_blocks_in_batches(new_blocks, full_node_api_1.full_node)
 
         coin_3 = None
         for coin in run_and_get_removals_and_additions(
@@ -370,12 +368,11 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             guarantee_transaction_block=True,
         )
-
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await add_blocks_in_batches(new_blocks, full_node_api_1.full_node)
 
     @pytest.mark.anyio
     async def test_validate_blockchain_spend_reorg_cb_coin(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 15
         wallet_a = WALLET_A
@@ -383,9 +380,7 @@ class TestBlockchainTransactions:
         receiver_1_puzzlehash = WALLET_A_PUZZLE_HASHES[1]
         full_node_api_1, _, _, _, bt = two_nodes
         blocks = bt.get_consecutive_blocks(num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash)
-
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Spends a coinbase created in reorg
         new_blocks = bt.get_consecutive_blocks(
@@ -396,8 +391,7 @@ class TestBlockchainTransactions:
             guarantee_transaction_block=True,
         )
 
-        for block in new_blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(new_blocks, full_node_api_1.full_node)
 
         spend_block = new_blocks[-1]
         spend_coin = None
@@ -415,12 +409,11 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
             guarantee_transaction_block=True,
         )
-
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await add_blocks_in_batches(new_blocks, full_node_api_1.full_node)
 
     @pytest.mark.anyio
     async def test_validate_blockchain_spend_reorg_since_genesis(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -431,8 +424,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         spend_block = blocks[-1]
         spend_coin = None
@@ -445,7 +437,7 @@ class TestBlockchainTransactions:
         new_blocks = bt.get_consecutive_blocks(
             1, blocks, seed=b"", farmer_reward_puzzle_hash=coinbase_puzzlehash, transaction_data=spend_bundle
         )
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await _validate_and_add_block(full_node_api_1.full_node.blockchain, new_blocks[-1])
 
         # Spends a coin in a genesis reorg, that was already spent
         new_blocks = bt.get_consecutive_blocks(
@@ -456,9 +448,6 @@ class TestBlockchainTransactions:
             guarantee_transaction_block=True,
         )
 
-        for block in new_blocks:
-            await full_node_api_1.full_node.add_block(block)
-
         new_blocks = bt.get_consecutive_blocks(
             1,
             new_blocks,
@@ -467,11 +456,11 @@ class TestBlockchainTransactions:
             transaction_data=spend_bundle,
         )
 
-        await full_node_api_1.full_node.add_block(new_blocks[-1])
+        await add_blocks_in_batches(new_blocks, full_node_api_1.full_node)
 
     @pytest.mark.anyio
     async def test_assert_my_coin_id(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -484,8 +473,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
 
@@ -543,7 +531,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_coin_announcement_consumed(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -556,8 +544,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -627,7 +614,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_puzzle_announcement_consumed(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -640,8 +627,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -711,7 +697,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_height_absolute(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -724,8 +710,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -777,7 +762,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_height_relative(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 11
         wallet_a = WALLET_A
@@ -790,8 +775,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -845,7 +829,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_seconds_relative(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -858,8 +842,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -903,7 +886,7 @@ class TestBlockchainTransactions:
                 time_per_block=301,
             )
         )
-        await full_node_api_1.full_node.add_block(blocks[-1])
+        await _validate_and_add_block(full_node_1.blockchain, blocks[-1])
 
         valid_new_blocks = bt.get_consecutive_blocks(
             1,
@@ -917,7 +900,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_seconds_absolute(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -930,8 +913,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]
@@ -977,7 +959,7 @@ class TestBlockchainTransactions:
                 time_per_block=30,
             )
         )
-        await full_node_api_1.full_node.add_block(blocks[-1])
+        await _validate_and_add_block(full_node_1.blockchain, blocks[-1])
 
         valid_new_blocks = bt.get_consecutive_blocks(
             1,
@@ -991,7 +973,7 @@ class TestBlockchainTransactions:
 
     @pytest.mark.anyio
     async def test_assert_fee_condition(
-        self, two_nodes: Tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
+        self, two_nodes: tuple[FullNodeAPI, FullNodeAPI, ChiaServer, ChiaServer, BlockTools]
     ) -> None:
         num_blocks = 10
         wallet_a = WALLET_A
@@ -1004,8 +986,7 @@ class TestBlockchainTransactions:
             num_blocks, farmer_reward_puzzle_hash=coinbase_puzzlehash, guarantee_transaction_block=True
         )
 
-        for block in blocks:
-            await full_node_api_1.full_node.add_block(block)
+        await add_blocks_in_batches(blocks, full_node_api_1.full_node)
 
         # Coinbase that gets spent
         block1 = blocks[2]

chia/_tests/blockchain/test_build_chains.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import List
-
 import pytest
 
 from chia.types.full_block import FullBlock
@@ -21,41 +19,41 @@ from chia.types.full_block import FullBlock
 
 
 @pytest.mark.build_test_chains
-def test_trigger_default_400(default_400_blocks: List[FullBlock]) -> None:
+def test_trigger_default_400(default_400_blocks: list[FullBlock]) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
-def test_trigger_default_1000(default_1000_blocks: List[FullBlock]) -> None:
+def test_trigger_default_1000(default_1000_blocks: list[FullBlock]) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
-def test_trigger_pre_genesis_empty_1000(pre_genesis_empty_slots_1000_blocks: List[FullBlock]) -> None:
+def test_trigger_pre_genesis_empty_1000(pre_genesis_empty_slots_1000_blocks: list[FullBlock]) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
-def test_trigger_default_1500(default_1500_blocks: List[FullBlock]) -> None:
+def test_trigger_default_1500(default_1500_blocks: list[FullBlock]) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
 def test_trigger_default_10000(
-    default_10000_blocks: List[FullBlock],
-    test_long_reorg_blocks: List[FullBlock],
-    test_long_reorg_blocks_light: List[FullBlock],
-    test_long_reorg_1500_blocks: List[FullBlock],
-    test_long_reorg_1500_blocks_light: List[FullBlock],
+    default_10000_blocks: list[FullBlock],
+    test_long_reorg_blocks: list[FullBlock],
+    test_long_reorg_blocks_light: list[FullBlock],
+    test_long_reorg_1500_blocks: list[FullBlock],
+    test_long_reorg_1500_blocks_light: list[FullBlock],
 ) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
-def test_trigger_default_2000_compact(default_2000_blocks_compact: List[FullBlock]) -> None:
+def test_trigger_default_2000_compact(default_2000_blocks_compact: list[FullBlock]) -> None:
     pass
 
 
 @pytest.mark.build_test_chains
-def test_trigger_default_10000_compact(default_10000_blocks_compact: List[FullBlock]) -> None:
+def test_trigger_default_10000_compact(default_10000_blocks_compact: list[FullBlock]) -> None:
     pass

chia/_tests/blockchain/test_get_block_generator.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, List, Optional, Set
+from typing import Optional
 
 import pytest
 from clvm.casts import int_to_bytes
@@ -17,7 +17,7 @@ from chia.util.ints import uint32
 class BR:
     prev_header_hash: bytes32
     transactions_generator: Optional[SerializedProgram]
-    transactions_generator_ref_list: List[uint32]
+    transactions_generator_ref_list: list[uint32]
 
 
 @dataclass(frozen=True)
@@ -35,15 +35,15 @@ def program(i: int) -> SerializedProgram:
     return SerializedProgram.from_bytes(int_to_bytes(i))
 
 
-async def zero_hits(hh: bytes32, refs: Set[uint32]) -> Dict[uint32, bytes]:
+async def zero_hits(hh: bytes32, refs: set[uint32]) -> dict[uint32, bytes]:
     return {}
 
 
-async def never_called(hh: bytes32, refs: Set[uint32]) -> Dict[uint32, bytes]:
+async def never_called(hh: bytes32, refs: set[uint32]) -> dict[uint32, bytes]:
     assert False  # pragma: no cover
 
 
-async def only_lookup_5(hh: bytes32, refs: Set[uint32]) -> Dict[uint32, bytes]:
+async def only_lookup_5(hh: bytes32, refs: set[uint32]) -> dict[uint32, bytes]:
     assert refs == {uint32(5)}
     return {uint32(5): bytes(program(5))}
 
@@ -53,20 +53,20 @@ DUMMY_PROGRAM = SerializedProgram.from_bytes(b"\x80")
 
 @pytest.mark.anyio
 async def test_failing_lookup() -> None:
-    br = BR(bytes32([0] * 32), DUMMY_PROGRAM, [uint32(1)])
+    br = BR(bytes32.zeros, DUMMY_PROGRAM, [uint32(1)])
     with pytest.raises(KeyError):
         await get_block_generator(zero_hits, br)
 
 
 @pytest.mark.anyio
 async def test_no_generator() -> None:
-    br = BR(bytes32([0] * 32), None, [uint32(1)])
+    br = BR(bytes32.zeros, None, [uint32(1)])
     with pytest.raises(AssertionError):
         await get_block_generator(zero_hits, br)
 
 
 @pytest.mark.anyio
 async def test_no_refs() -> None:
-    br = BR(bytes32([0] * 32), DUMMY_PROGRAM, [])
+    br = BR(bytes32.zeros, DUMMY_PROGRAM, [])
     bg = await get_block_generator(never_called, br)
     assert bg == BlockGenerator(DUMMY_PROGRAM, [])

chia/_tests/blockchain/test_lookup_fork_chain.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, List
 
 import pytest
 
@@ -15,7 +14,7 @@ from chia.util.ints import uint32
 
 
 class DummyChain:
-    _chain: Dict[bytes32, bytes32]
+    _chain: dict[bytes32, bytes32]
 
     def __init__(self) -> None:
         self._chain = {}
@@ -23,8 +22,8 @@ class DummyChain:
     def add_block(self, h: bytes32, prev: bytes32) -> None:
         self._chain[h] = prev
 
-    async def prev_block_hash(self, header_hashes: List[bytes32]) -> List[bytes32]:
-        ret: List[bytes32] = []
+    async def prev_block_hash(self, header_hashes: list[bytes32]) -> list[bytes32]:
+        ret: list[bytes32] = []
         for h in header_hashes:
             ret.append(self._chain[h])
         return ret

chia/_tests/build-init-files.py

@@ -13,7 +13,6 @@ from __future__ import annotations
 
 import logging
 import pathlib
-from typing import List
 
 import click
 
@@ -27,8 +26,8 @@ log_levels = {
 ignores = {"__pycache__", ".pytest_cache"}
 
 
-def traverse_directory(path: pathlib.Path) -> List[pathlib.Path]:
-    of_interest: List[pathlib.Path] = []
+def traverse_directory(path: pathlib.Path) -> list[pathlib.Path]:
+    of_interest: list[pathlib.Path] = []
 
     file_found = False
 
@@ -90,4 +89,4 @@ def command(verbose, root_str):
         raise click.ClickException("At least one __init__.py created or not a regular file")
 
 
-command()  # pylint: disable=no-value-for-parameter
+command()

chia/_tests/build-job-matrix.py

@@ -6,7 +6,7 @@ import json
 import logging
 import types
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any
 
 import testconfig
 
@@ -18,7 +18,7 @@ def skip(path: Path) -> bool:
     return any(part.startswith(("_", ".")) and part != "_tests" for part in path.parts)
 
 
-def subdirs(per: str) -> List[Path]:
+def subdirs(per: str) -> list[Path]:
     if per == "directory":
         glob_pattern = "**/"
     elif per == "file":
@@ -44,11 +44,11 @@ def subdirs(per: str) -> List[Path]:
     return sorted(paths)
 
 
-def module_dict(module: types.ModuleType) -> Dict[str, Any]:
+def module_dict(module: types.ModuleType) -> dict[str, Any]:
     return {k: v for k, v in module.__dict__.items() if not k.startswith("_") and k != "annotations"}
 
 
-def dir_config(dir: Path) -> Dict[str, Any]:
+def dir_config(dir: Path) -> dict[str, Any]:
     import importlib
 
     module_name = ".".join([*dir.relative_to(root_path).parts, "config"])
@@ -60,14 +60,14 @@ def dir_config(dir: Path) -> Dict[str, Any]:
 
 @dataclasses.dataclass
 class SpecifiedDefaultsError(Exception):
-    overlap: Dict[str, Any]
+    overlap: dict[str, Any]
 
     def __post_init__(self) -> None:
         super().__init__()
 
 
 # Overwrite with directory specific values
-def update_config(parent: Dict[str, Any], child: Dict[str, Any]) -> Dict[str, Any]:
+def update_config(parent: dict[str, Any], child: dict[str, Any]) -> dict[str, Any]:
     if child is None:
         return parent
     conf = child
@@ -107,8 +107,8 @@ test_paths_with_index = [(path, index + 1) for path in test_paths for index in r
 
 configuration = []
 
-specified_defaults: Dict[Path, Dict[str, Any]] = {}
-pytest_monitor_enabling_paths: List[Path] = []
+specified_defaults: dict[Path, dict[str, Any]] = {}
+pytest_monitor_enabling_paths: list[Path] = []
 
 for path, index in test_paths_with_index:
     if path.is_dir():
@@ -177,7 +177,7 @@ for path, index in test_paths_with_index:
     for_matrix = dict(sorted(for_matrix.items()))
     configuration.append(for_matrix)
 
-messages: List[str] = []
+messages: list[str] = []
 
 if len(specified_defaults) > 0:
     message = f"Found {len(specified_defaults)} directories with specified defaults"