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

chia/_tests/README.md

@@ -21,7 +21,7 @@ The subdirectory jobs do not include the tests from their parents.
 
 ## testconfig.py
 
-In the top tests directory, [testconfig.py](https://github.com/Chia-Network/chia-blockchain/tree/main/tests/testconfig.py)
+In the top tests directory, [testconfig.py](https://github.com/Chia-Network/chia-blockchain/blob/main/chia/_tests/testconfig.py)
 contains the application settings and the per-directory default settings.
 
 ## config.py

chia/_tests/blockchain/blockchain_test_utils.py

@@ -1,14 +1,16 @@
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import Optional
 
-from chia_rs import BLSCache
+from chia_rs import SpendBundleConditions
 
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.blockchain import AddBlockResult, Blockchain
 from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
-from chia.consensus.multiprocess_validation import PreValidationResult, pre_validate_blocks_multiprocessing
+from chia.consensus.multiprocess_validation import PreValidationResult, pre_validate_block
 from chia.types.full_block import FullBlock
+from chia.types.validation_state import ValidationState
+from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
 from chia.util.ints import uint32, uint64
 
@@ -49,7 +51,6 @@ async def _validate_and_add_block(
     expected_error: Optional[Err] = None,
     skip_prevalidation: bool = False,
     fork_info: Optional[ForkInfo] = None,
-    use_bls_cache: bool = False,
 ) -> None:
     # Tries to validate and add the block, and checks that there are no errors in the process and that the
     # block is added to the peak.
@@ -70,24 +71,24 @@ async def _validate_and_add_block(
     new_slot = len(block.finished_sub_slots) > 0
     ssi, diff = get_next_sub_slot_iters_and_difficulty(blockchain.constants, new_slot, prev_b, blockchain)
     await check_block_store_invariant(blockchain)
+
     if skip_prevalidation:
-        results = PreValidationResult(None, uint64(1), None, False, uint32(0))
+        if block.transactions_generator is None:
+            conds = None
+        else:
+            # fake the signature validation. Just say True here.
+            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
+        results = PreValidationResult(None, uint64(1), conds, uint32(0))
     else:
-        # validate_signatures must be False in order to trigger add_block() to
-        # validate the signature.
-        pre_validation_results: List[PreValidationResult] = await pre_validate_blocks_multiprocessing(
+        future = await pre_validate_block(
             blockchain.constants,
-            blockchain,
-            [block],
+            AugmentedBlockchain(blockchain),
+            block,
             blockchain.pool,
-            {},
-            sub_slot_iters=ssi,
-            difficulty=diff,
-            prev_ses_block=prev_ses_block,
-            validate_signatures=False,
+            None,
+            ValidationState(ssi, diff, prev_ses_block),
         )
-        assert pre_validation_results is not None
-        results = pre_validation_results[0]
+        results = await future
     if results.error is not None:
         if expected_result == AddBlockResult.INVALID_BLOCK and expected_error is None:
             # We expected an error but didn't specify which one
@@ -101,17 +102,14 @@ async def _validate_and_add_block(
             raise AssertionError(f"Expected {expected_error} but got {Err(results.error)}")
         await check_block_store_invariant(blockchain)
         return None
-
-    if use_bls_cache:
-        bls_cache = BLSCache(100)
-    else:
-        bls_cache = None
+    if fork_info is None:
+        fork_info = ForkInfo(block.height - 1, block.height - 1, block.prev_header_hash)
 
     (
         result,
         err,
         _,
-    ) = await blockchain.add_block(block, results, bls_cache, ssi, fork_info=fork_info)
+    ) = await blockchain.add_block(block, results, ssi, fork_info=fork_info)
     await check_block_store_invariant(blockchain)
 
     if expected_error is None and expected_result != AddBlockResult.INVALID_BLOCK:
@@ -139,7 +137,7 @@ async def _validate_and_add_block(
 async def _validate_and_add_block_multi_error(
     blockchain: Blockchain,
     block: FullBlock,
-    expected_errors: List[Err],
+    expected_errors: list[Err],
     skip_prevalidation: bool = False,
     fork_info: Optional[ForkInfo] = None,
 ) -> None:
@@ -157,7 +155,7 @@ async def _validate_and_add_block_multi_error(
 async def _validate_and_add_block_multi_result(
     blockchain: Blockchain,
     block: FullBlock,
-    expected_result: List[AddBlockResult],
+    expected_result: list[AddBlockResult],
     skip_prevalidation: bool = False,
     fork_info: Optional[ForkInfo] = None,
 ) -> None:
@@ -171,7 +169,7 @@ async def _validate_and_add_block_multi_result(
     except Exception as e:
         assert isinstance(e, AssertionError)
         assert "Block was not added" in e.args[0]
-        expected_list: List[str] = [f"Block was not added: {res}" for res in expected_result]
+        expected_list: list[str] = [f"Block was not added: {res}" for res in expected_result]
         if e.args[0] not in expected_list:
             raise AssertionError(f"{e.args[0].split('Block was not added: ')[1]} not in {expected_result}")
 

chia/_tests/blockchain/test_augmented_chain.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, ClassVar, Dict, List, Optional, Set, cast
+from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
 import pytest
 
@@ -15,17 +15,16 @@ from chia.util.ints import uint32
 
 @dataclass
 class NullBlockchain:
-
     if TYPE_CHECKING:
         from chia.consensus.blockchain_interface import BlocksProtocol
 
         _protocol_check: ClassVar[BlocksProtocol] = cast("NullBlockchain", None)
 
-    added_blocks: Set[bytes32] = field(default_factory=set)
-    heights: Dict[uint32, bytes32] = field(default_factory=dict)
+    added_blocks: set[bytes32] = field(default_factory=set)
+    heights: dict[uint32, bytes32] = field(default_factory=dict)
 
     # BlocksProtocol
-    async def lookup_block_generators(self, header_hash: bytes32, generator_refs: Set[uint32]) -> Dict[uint32, bytes]:
+    async def lookup_block_generators(self, header_hash: bytes32, generator_refs: set[uint32]) -> dict[uint32, bytes]:
         raise ValueError(Err.GENERATOR_REF_HAS_NO_GENERATOR)  # pragma: no cover
 
     async def get_block_record_from_db(self, header_hash: bytes32) -> Optional[BlockRecord]:
@@ -53,7 +52,7 @@ class NullBlockchain:
     def contains_height(self, height: uint32) -> bool:
         return height in self.heights.keys()
 
-    async def prev_block_hash(self, header_hashes: List[bytes32]) -> List[bytes32]:
+    async def prev_block_hash(self, header_hashes: list[bytes32]) -> list[bytes32]:
         raise KeyError("no block records in NullBlockchain")  # pragma: no cover
 
 
@@ -71,8 +70,7 @@ def BR(b: FullBlock) -> BlockRecord:
 
 @pytest.mark.anyio
 @pytest.mark.limit_consensus_modes(reason="save time")
-async def test_augmented_chain(default_10000_blocks: List[FullBlock]) -> None:
-
+async def test_augmented_chain(default_10000_blocks: list[FullBlock]) -> None:
     blocks = default_10000_blocks
     # this test blockchain is expected to have block generators at these
     # heights: