chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.6.0rc2__py3-none-any.whl

chia/_tests/wallet/test_notifications.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import random
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -109,8 +109,8 @@ async def test_notifications(
 
     notification_manager_2.potentially_add_new_notification = track_coin_state
 
-    allow_larger_height: Optional[int] = None
-    allow_height: Optional[int] = None
+    allow_larger_height: int | None = None
+    allow_height: int | None = None
 
     for case in ("block all", "block too low", "allow", "allow_larger", "block_too_large"):
         msg: bytes = bytes(case, "utf8")
@@ -165,34 +165,34 @@ async def test_notifications(
     assert allow_larger_height is not None
     assert allow_height is not None
 
-    notifications = await notification_manager_2.notification_store.get_all_notifications(pagination=(0, 2))
+    notifications = await notification_manager_2.notification_store.get_notifications(pagination=(0, 2))
     assert len(notifications) == 2
     assert notifications[0].message == b"allow_larger"
     assert notifications[0].height == allow_larger_height
-    notifications = await notification_manager_2.notification_store.get_all_notifications(pagination=(1, None))
+    notifications = await notification_manager_2.notification_store.get_notifications(pagination=(1, None))
     assert len(notifications) == 1
     assert notifications[0].message == b"allow"
     assert notifications[0].height == allow_height
-    notifications = await notification_manager_2.notification_store.get_all_notifications(pagination=(0, 1))
+    notifications = await notification_manager_2.notification_store.get_notifications(pagination=(0, 1))
     assert len(notifications) == 1
     assert notifications[0].message == b"allow_larger"
-    notifications = await notification_manager_2.notification_store.get_all_notifications(pagination=(None, 1))
+    notifications = await notification_manager_2.notification_store.get_notifications(pagination=(None, 1))
     assert len(notifications) == 1
     assert notifications[0].message == b"allow_larger"
     assert (
-        await notification_manager_2.notification_store.get_notifications([n.id for n in notifications])
+        await notification_manager_2.notification_store.get_notifications(coin_ids=[n.id for n in notifications])
         == notifications
     )
 
-    sent_notifications = await notification_manager_1.notification_store.get_all_notifications()
+    sent_notifications = await notification_manager_1.notification_store.get_notifications()
     assert len(sent_notifications) == 0
 
-    await notification_manager_2.notification_store.delete_all_notifications()
-    assert len(await notification_manager_2.notification_store.get_all_notifications()) == 0
+    await notification_manager_2.notification_store.delete_notifications()
+    assert len(await notification_manager_2.notification_store.get_notifications()) == 0
     await notification_manager_2.notification_store.add_notification(notifications[0])
-    await notification_manager_2.notification_store.delete_notifications([n.id for n in notifications])
-    assert len(await notification_manager_2.notification_store.get_all_notifications()) == 0
+    await notification_manager_2.notification_store.delete_notifications(coin_ids=[n.id for n in notifications])
+    assert len(await notification_manager_2.notification_store.get_notifications()) == 0
 
     assert not await func(*notification_manager_2.most_recent_args)
-    await notification_manager_2.notification_store.delete_all_notifications()
+    await notification_manager_2.notification_store.delete_notifications()
     assert not await func(*notification_manager_2.most_recent_args)

chia/_tests/wallet/test_signer_protocol.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Optional
 
 import click
 import pytest
@@ -135,7 +134,7 @@ async def test_p2dohp_wallet_signer_protocol(wallet_environments: WalletTestFram
     async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=False) as action_scope:
         [coin] = await wallet.select_coins(uint64(0), action_scope)
     puzzle: Program = await wallet.puzzle_for_puzzle_hash(coin.puzzle_hash)
-    delegated_puzzle: Program = Program.to(None)
+    delegated_puzzle: Program = Program.NIL
     delegated_puzzle_hash: bytes32 = delegated_puzzle.get_tree_hash()
     solution: Program = Program.to([None, None, None])
 
@@ -145,9 +144,9 @@ async def test_p2dohp_wallet_signer_protocol(wallet_environments: WalletTestFram
         solution,
     )
 
-    derivation_record: Optional[
-        DerivationRecord
-    ] = await wallet_state_manager.puzzle_store.get_derivation_record_for_puzzle_hash(coin.puzzle_hash)
+    derivation_record: (
+        DerivationRecord | None
+    ) = await wallet_state_manager.puzzle_store.get_derivation_record_for_puzzle_hash(coin.puzzle_hash)
     assert derivation_record is not None
     pubkey: G1Element = derivation_record.pubkey
     atom = puzzle.uncurry()[1].at("f").atom
@@ -687,6 +686,7 @@ async def test_signer_commands(wallet_environments: WalletTestFramework) -> None
         )
 
 
+@pytest.mark.filterwarnings("ignore:The parameter .* is used more than once:UserWarning")
 def test_signer_command_default_parsing() -> None:
     check_click_parsing(
         GatherSigningInfoCMD(

chia/_tests/wallet/test_singleton_lifecycle_fast.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Callable, Optional, TypeVar, cast, get_args, get_origin
+from typing import Any, TypeVar, cast, get_args, get_origin
 
 from chia_rs import CoinSpend, G1Element, G2Element
 from chia_rs.sized_bytes import bytes32
@@ -78,7 +79,7 @@ class PuzzleDB:
     def add_puzzle(self, puzzle: Program) -> None:
         self._db[puzzle.get_tree_hash()] = Program.from_bytes(bytes(puzzle))
 
-    def puzzle_for_hash(self, puzzle_hash: bytes32) -> Optional[Program]:
+    def puzzle_for_hash(self, puzzle_hash: bytes32) -> Program | None:
         return self._db.get(puzzle_hash)
 
 
@@ -237,7 +238,7 @@ class SingletonWallet:
     current_state: Coin
     lineage_proof: Program
 
-    def inner_puzzle(self, puzzle_db: PuzzleDB) -> Optional[Program]:
+    def inner_puzzle(self, puzzle_db: PuzzleDB) -> Program | None:
         puzzle = puzzle_db.puzzle_for_hash(self.current_state.puzzle_hash)
         if puzzle is None:
             return None

chia/_tests/wallet/test_transaction_store.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import dataclasses
 import random
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -31,24 +31,24 @@ coin_2 = Coin(bytes32.random(module_seeded_random), bytes32.random(module_seeded
 coin_3 = Coin(bytes32.random(module_seeded_random), bytes32.random(module_seeded_random), uint64(12312 - 1234))
 
 tr1 = TransactionRecord(
-    uint32(0),  # confirmed height
-    uint64(1000),  # created_at_time
-    bytes32(bytes32.zeros),  # to_puzzle_hash
-    uint64(1234),  # amount
-    uint64(12),  # fee_amount
-    False,  # confirmed
-    uint32(0),  # sent
-    None,  # Optional[SpendBundle] spend_bundle
-    [coin_2, coin_3],  # additions
-    [coin_1],  # removals
-    uint32(1),  # wallet_id
-    [],  # list[tuple[str, uint8, Optional[str]]] sent_to
-    bytes32(bytes32.random(module_seeded_random)),  # trade_id
-    uint32(TransactionType.OUTGOING_TX),  # type
-    bytes32(bytes32.random(module_seeded_random)),  # name
-    {},  # memos
-    ConditionValidTimes(),
-    encode_puzzle_hash(bytes32(bytes32.zeros), "txch"),
+    confirmed_at_height=uint32(0),
+    created_at_time=uint64(1000),
+    to_puzzle_hash=bytes32(bytes32.zeros),
+    to_address=encode_puzzle_hash(bytes32(bytes32.zeros), "txch"),
+    amount=uint64(1234),
+    fee_amount=uint64(12),
+    confirmed=False,
+    sent=uint32(0),
+    spend_bundle=None,
+    additions=[coin_2, coin_3],
+    removals=[coin_1],
+    wallet_id=uint32(1),
+    sent_to=[],
+    trade_id=bytes32(bytes32.random(module_seeded_random)),
+    type=uint32(TransactionType.OUTGOING_TX),
+    name=bytes32(bytes32.random(module_seeded_random)),
+    memos={},
+    valid_times=ConditionValidTimes(),
 )
 
 MINIMUM_CONFIG = {
@@ -811,7 +811,7 @@ async def test_get_not_sent(seeded_random: random.Random) -> None:
 
 @pytest.mark.anyio
 async def test_transaction_record_is_valid() -> None:
-    invalid_attempts: list[tuple[str, uint8, Optional[str]]] = []
+    invalid_attempts: list[tuple[str, uint8, str | None]] = []
     # The tx should be valid as long as we don't have minimum_send_attempts failed attempts
     while len(invalid_attempts) < minimum_send_attempts:
         assert dataclasses.replace(tr1, sent_to=invalid_attempts).is_valid()

chia/_tests/wallet/test_util.py

@@ -106,7 +106,7 @@ def test_list_to_binary_tree() -> None:
 @pytest.mark.parametrize(
     "serializations",
     [
-        (tuple(), Program.to(None), []),
+        (tuple(), Program.NIL, []),
         ((bytes32.zeros,), Program.to([bytes32.zeros]), [LineageProofField.PARENT_NAME]),
         (
             (bytes32.zeros, bytes32.zeros),
@@ -129,7 +129,7 @@ def test_lineage_proof_varargs(serializations: tuple[tuple[Any, ...], Program, l
 @pytest.mark.parametrize(
     "serializations",
     [
-        ({}, Program.to(None), []),
+        ({}, Program.NIL, []),
         ({"parent_name": bytes32.zeros}, Program.to([bytes32.zeros]), [LineageProofField.PARENT_NAME]),
         (
             {"parent_name": bytes32.zeros, "inner_puzzle_hash": bytes32.zeros},