ruff

Author: richardkiss

chia/_tests/blockchain/blockchain_test_utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Optional
+from typing import Optional, cast
 
 from chia_rs import FullBlock, SpendBundleConditions
 from chia_rs.sized_ints import uint32, uint64
@@ -10,19 +10,20 @@
 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_block
+from chia.full_node.block_store import BlockStore
 from chia.types.validation_state import ValidationState
 from chia.util.errors import Err
 
 
 async def check_block_store_invariant(bc: Blockchain):
-    db_wrapper = bc.block_store.db_wrapper
+    block_store = cast(BlockStore, bc.block_store)
 
-    if db_wrapper.db_version == 1:
+    if block_store.db_wrapper.db_version == 1:
         return
 
     in_chain = set()
     max_height = -1
-    async with db_wrapper.writer_maybe_transaction() as conn:
+    async with block_store.transaction() as conn:
         async with conn.execute("SELECT height, in_main_chain FROM full_blocks") as cursor:
             rows = await cursor.fetchall()
             for row in rows:

chia/consensus/block_store_protocol.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from contextlib import AbstractAsyncContextManager
-from typing import Optional, Protocol
+from typing import Any, Optional, Protocol
 
 from chia_rs import BlockRecord, FullBlock, SubEpochChallengeSegment
 from chia_rs.sized_bytes import bytes32
@@ -47,4 +47,4 @@ async def get_block_records_close_to_peak(
     ) -> tuple[dict[bytes32, BlockRecord], Optional[bytes32]]: ...
     def get_host_parameter_limit(self) -> int: ...
     async def get_prev_hash(self, header_hash: bytes32) -> bytes32: ...
-    def transaction(self) -> AbstractAsyncContextManager[None]: ...
+    def transaction(self) -> AbstractAsyncContextManager[Any]: ...

chia/simulator/full_node_simulator.py

@@ -167,7 +167,7 @@ async def revert_block_height(self, new_height: uint32) -> None:
                 raise ValueError("Cannot revert to a height less than 1.")
             block_record: BlockRecord = self.full_node.blockchain.height_to_block_record(new_height)
             # remove enough data to allow a bunch of blocks to be wiped.
-            async with self.full_node.block_store.db_wrapper.writer():
+            async with self.full_node.block_store.transaction():
                 # set coinstore
                 await self.full_node.coin_store.rollback_to_block(new_height)
                 # set blockstore to new height