ruff changes

Author: Quexington

benchmarks/block_ref.py

@@ -6,7 +6,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 from time import monotonic
-from typing import Optional
 
 import aiosqlite
 import click
@@ -38,7 +37,7 @@
 @dataclass(frozen=True)
 class BlockInfo:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     transactions_generator_ref_list: list[uint32]
 
 

benchmarks/mempool-long-lived.py

@@ -4,7 +4,6 @@
 from collections.abc import Collection
 from dataclasses import dataclass
 from time import monotonic
-from typing import Optional
 
 from chia_rs import CoinSpend, G2Element, SpendBundle
 from chia_rs.sized_bytes import bytes32
@@ -35,9 +34,9 @@ class BenchBlockRecord:
 
     header_hash: bytes32
     height: uint32
-    timestamp: Optional[uint64]
+    timestamp: uint64 | None
     prev_transaction_block_height: uint32
-    prev_transaction_block_hash: Optional[bytes32]
+    prev_transaction_block_hash: bytes32 | None
 
     @property
     def is_transaction_block(self) -> bool:
@@ -90,7 +89,7 @@ async def get_coin_record(coin_ids: Collection[bytes32]) -> list[CoinRecord]:
         return ret
 
     # We currently don't need to keep track of these for our purpose
-    async def get_unspent_lineage_info_for_puzzle_hash(_: bytes32) -> Optional[UnspentLineageInfo]:
+    async def get_unspent_lineage_info_for_puzzle_hash(_: bytes32) -> UnspentLineageInfo | None:
         assert False
 
     timestamp = uint64(1631794488)

benchmarks/mempool.py

@@ -7,7 +7,6 @@
 from dataclasses import dataclass
 from subprocess import check_call
 from time import monotonic
-from typing import Optional
 
 from chia_rs import SpendBundle
 from chia_rs.sized_bytes import bytes32
@@ -58,9 +57,9 @@ class BenchBlockRecord:
 
     header_hash: bytes32
     height: uint32
-    timestamp: Optional[uint64]
+    timestamp: uint64 | None
     prev_transaction_block_height: uint32
-    prev_transaction_block_hash: Optional[bytes32]
+    prev_transaction_block_hash: bytes32 | None
 
     @property
     def is_transaction_block(self) -> bool:
@@ -91,7 +90,7 @@ async def get_coin_records(coin_ids: Collection[bytes32]) -> list[CoinRecord]:
         return ret
 
     # We currently don't need to keep track of these for our purpose
-    async def get_unspent_lineage_info_for_puzzle_hash(_: bytes32) -> Optional[UnspentLineageInfo]:
+    async def get_unspent_lineage_info_for_puzzle_hash(_: bytes32) -> UnspentLineageInfo | None:
         assert False
 
     wt = WalletTool(DEFAULT_CONSTANTS)

benchmarks/streamable.py

@@ -3,11 +3,12 @@
 import json
 import random
 import sys
+from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
 from statistics import stdev
 from time import process_time as clock
-from typing import Any, Callable, Optional, TextIO, Union
+from typing import Any, TextIO
 
 import click
 from chia_rs import FullBlock
@@ -43,8 +44,8 @@ class BenchmarkMiddle(Streamable):
 @streamable
 @dataclass(frozen=True)
 class BenchmarkClass(Streamable):
-    a: Optional[BenchmarkMiddle]
-    b: Optional[BenchmarkMiddle]
+    a: BenchmarkMiddle | None
+    b: BenchmarkMiddle | None
     c: BenchmarkMiddle
     d: list[BenchmarkMiddle]
     e: tuple[BenchmarkMiddle, BenchmarkMiddle, BenchmarkMiddle]
@@ -64,8 +65,8 @@ def get_random_middle() -> BenchmarkMiddle:
 
 
 def get_random_benchmark_object() -> BenchmarkClass:
-    a: Optional[BenchmarkMiddle] = None
-    b: Optional[BenchmarkMiddle] = get_random_middle()
+    a: BenchmarkMiddle | None = None
+    b: BenchmarkMiddle | None = get_random_middle()
     c: BenchmarkMiddle = get_random_middle()
     d: list[BenchmarkMiddle] = [get_random_middle() for _ in range(5)]
     e: tuple[BenchmarkMiddle, BenchmarkMiddle, BenchmarkMiddle] = (
@@ -79,10 +80,10 @@ def get_random_benchmark_object() -> BenchmarkClass:
 def print_row(
     *,
     mode: str,
-    us_per_iteration: Union[str, float],
-    stdev_us_per_iteration: Union[str, float],
-    avg_iterations: Union[str, int],
-    stdev_iterations: Union[str, float],
+    us_per_iteration: str | float,
+    stdev_us_per_iteration: str | float,
+    avg_iterations: str | int,
+    stdev_iterations: str | float,
     end: str = "\n",
 ) -> None:
     print(
@@ -142,14 +143,14 @@ def to_bytes(obj: Any) -> bytes:
 @dataclass
 class ModeParameter:
     conversion_cb: Callable[[Any], Any]
-    preparation_cb: Optional[Callable[[Any], Any]] = None
+    preparation_cb: Callable[[Any], Any] | None = None
 
 
 @dataclass
 class BenchmarkParameter:
     data_class: type[Any]
     object_creation_cb: Callable[[], Any]
-    mode_parameter: dict[Mode, Optional[ModeParameter]]
+    mode_parameter: dict[Mode, ModeParameter | None]
 
 
 benchmark_parameter: dict[Data, BenchmarkParameter] = {
@@ -202,12 +203,12 @@ def pop_data(key: str, *, old: dict[str, Any], new: dict[str, Any]) -> tuple[Any
     return old.pop(key), new.pop(key)
 
 
-def print_compare_row(c0: str, c1: Union[str, float], c2: Union[str, float], c3: Union[str, float]) -> None:
+def print_compare_row(c0: str, c1: str | float, c2: str | float, c3: str | float) -> None:
     print(f"{c0:<12} | {c1:<16} | {c2:<16} | {c3:<12}")
 
 
 def compare_results(
-    old: dict[str, dict[str, dict[str, Union[float, int]]]], new: dict[str, dict[str, dict[str, Union[float, int]]]]
+    old: dict[str, dict[str, dict[str, float | int]]], new: dict[str, dict[str, dict[str, float | int]]]
 ) -> None:
     old_version, new_version = pop_data("version", old=old, new=new)
     if old_version != new_version:

benchmarks/utils.py

@@ -7,7 +7,7 @@
 import sys
 from collections.abc import AsyncIterator
 from pathlib import Path
-from typing import Any, Generic, Optional, TypeVar, Union
+from typing import Any, Generic, TypeVar
 
 import click
 
@@ -22,20 +22,20 @@ def __init__(self, enum: type[_T_Enum], case_sensitive: bool = False) -> None:
         self.__enum = enum
         super().__init__(choices=[item.value for item in enum], case_sensitive=case_sensitive)
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> _T_Enum:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> _T_Enum:
         converted_str = super().convert(value, param, ctx)
         return self.__enum(converted_str)
 
 
 @contextlib.asynccontextmanager
-async def setup_db(name: Union[str, os.PathLike[str]], db_version: int) -> AsyncIterator[DBWrapper2]:
+async def setup_db(name: str | os.PathLike[str], db_version: int) -> AsyncIterator[DBWrapper2]:
     db_filename = Path(name)
     try:
         os.unlink(db_filename)
     except FileNotFoundError:
         pass
 
-    log_path: Optional[Path]
+    log_path: Path | None
     if "--sql-logging" in sys.argv:
         log_path = Path("sql.log")
     else:

chia/_tests/blockchain/blockchain_test_utils.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from chia_rs import FullBlock, SpendBundleConditions
 from chia_rs.sized_ints import uint32, uint64
 
@@ -46,10 +44,10 @@ async def _validate_and_add_block(
     blockchain: Blockchain,
     block: FullBlock,
     *,
-    expected_result: Optional[AddBlockResult] = None,
-    expected_error: Optional[Err] = None,
+    expected_result: AddBlockResult | None = None,
+    expected_error: Err | None = None,
     skip_prevalidation: bool = False,
-    fork_info: Optional[ForkInfo] = None,
+    fork_info: ForkInfo | None = None,
 ) -> 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.
@@ -137,7 +135,7 @@ async def _validate_and_add_block_multi_error(
     block: FullBlock,
     expected_errors: list[Err],
     skip_prevalidation: bool = False,
-    fork_info: Optional[ForkInfo] = None,
+    fork_info: ForkInfo | None = None,
 ) -> None:
     # Checks that the blockchain returns one of the expected errors
     try:
@@ -155,7 +153,7 @@ async def _validate_and_add_block_multi_result(
     block: FullBlock,
     expected_result: list[AddBlockResult],
     skip_prevalidation: bool = False,
-    fork_info: Optional[ForkInfo] = None,
+    fork_info: ForkInfo | None = None,
 ) -> None:
     try:
         await _validate_and_add_block(
@@ -176,7 +174,7 @@ async def _validate_and_add_block_no_error(
     blockchain: Blockchain,
     block: FullBlock,
     skip_prevalidation: bool = False,
-    fork_info: Optional[ForkInfo] = None,
+    fork_info: ForkInfo | None = None,
 ) -> None:
     # adds a block and ensures that there is no error. However, does not ensure that block extended the peak of
     # the blockchain

chia/_tests/blockchain/test_augmented_chain.py

@@ -2,7 +2,7 @@
 
 import re
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, ClassVar, Optional, cast
+from typing import TYPE_CHECKING, ClassVar, cast
 
 import pytest
 from chia_rs import BlockRecord, FullBlock
@@ -30,14 +30,14 @@ class NullBlockchain:
     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]:
+    async def get_block_record_from_db(self, header_hash: bytes32) -> BlockRecord | None:
         return None  # pragma: no cover
 
     def add_block_record(self, block_record: BlockRecord) -> None:
         self.added_blocks.add(block_record.header_hash)
 
     # BlockRecordsProtocol
-    def try_block_record(self, header_hash: bytes32) -> Optional[BlockRecord]:
+    def try_block_record(self, header_hash: bytes32) -> BlockRecord | None:
         return None  # pragma: no cover
 
     def block_record(self, header_hash: bytes32) -> BlockRecord:
@@ -46,7 +46,7 @@ def block_record(self, header_hash: bytes32) -> BlockRecord:
     def height_to_block_record(self, height: uint32) -> BlockRecord:
         raise ValueError("Height is not in blockchain")
 
-    def height_to_hash(self, height: uint32) -> Optional[bytes32]:
+    def height_to_hash(self, height: uint32) -> bytes32 | None:
         return self.heights.get(height)
 
     def contains_block(self, header_hash: bytes32, height: uint32) -> bool:

chia/_tests/blockchain/test_blockchain.py

@@ -9,7 +9,6 @@
 from collections.abc import AsyncIterator, Awaitable
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, replace
-from typing import Optional
 
 import pytest
 from chia_rs import (
@@ -3257,7 +3256,7 @@ async def test_invalid_agg_sig(self, empty_blockchain: Blockchain, bt: BlockTool
         assert preval_result.error == Err.BAD_AGGREGATE_SIGNATURE.value
 
 
-def maybe_header_hash(block: Optional[BlockRecord]) -> Optional[bytes32]:
+def maybe_header_hash(block: BlockRecord | None) -> bytes32 | None:
     if block is None:
         return None
     return block.header_hash
@@ -3304,7 +3303,7 @@ async def test_get_tx_peak_reorg(
             reorg_point = 12
         blocks = bt.get_consecutive_blocks(reorg_point)
 
-        last_tx_block: Optional[bytes32] = None
+        last_tx_block: bytes32 | None = None
         for block in blocks:
             assert maybe_header_hash(b.get_tx_peak()) == last_tx_block
             await _validate_and_add_block(b, block)
@@ -3315,7 +3314,7 @@ async def test_get_tx_peak_reorg(
         assert peak.height == reorg_point - 1
         assert maybe_header_hash(b.get_tx_peak()) == last_tx_block
 
-        reorg_last_tx_block: Optional[bytes32] = None
+        reorg_last_tx_block: bytes32 | None = None
         fork_block = blocks[9]
         fork_info = ForkInfo(fork_block.height, fork_block.height, fork_block.header_hash)
         blocks_reorg_chain = bt.get_consecutive_blocks(7, blocks[:10], seed=b"2")
@@ -4076,7 +4075,7 @@ async def test_get_tx_peak(default_400_blocks: list[FullBlock], empty_blockchain
     assert bc.get_tx_peak() == last_tx_block_record
 
 
-def to_bytes(gen: Optional[SerializedProgram]) -> bytes:
+def to_bytes(gen: SerializedProgram | None) -> bytes:
     assert gen is not None
     return bytes(gen)
 
@@ -4209,7 +4208,7 @@ async def get_fork_info(blockchain: Blockchain, block: FullBlock, peak: BlockRec
     counter = 0
     start = time.monotonic()
     for height in range(fork_info.fork_height + 1, block.height):
-        fork_block: Optional[FullBlock] = await blockchain.block_store.get_full_block(fork_chain[uint32(height)])
+        fork_block: FullBlock | None = await blockchain.block_store.get_full_block(fork_chain[uint32(height)])
         assert fork_block is not None
         assert fork_block.height - 1 == fork_info.peak_height
         assert fork_block.height == 0 or fork_block.prev_header_hash == fork_info.peak_hash

chia/_tests/blockchain/test_build_chains.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import pytest
 from chia_rs import Coin, ConsensusConstants, FullBlock, additions_and_removals, get_flags_for_height_and_constants
 from chia_rs.sized_ints import uint64
@@ -102,8 +100,8 @@ def validate_chain(
     normalized_to_identity_icc_eos: bool = False,
     normalized_to_identity_cc_sp: bool = False,
     normalized_to_identity_cc_ip: bool = False,
-    block_list_input: Optional[list[FullBlock]] = None,
-    time_per_block: Optional[float] = None,
+    block_list_input: list[FullBlock] | None = None,
+    time_per_block: float | None = None,
     dummy_block_references: bool = False,
     include_transactions: bool = False,
 ) -> None:

chia/_tests/blockchain/test_get_block_generator.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -16,14 +15,14 @@
 @dataclass(frozen=True)
 class BR:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     transactions_generator_ref_list: list[uint32]
 
 
 @dataclass(frozen=True)
 class FB:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     height: uint32