ruff

Author: matt-o-how

chia/_tests/clvm/coin_store.py

@@ -5,12 +5,11 @@
 from dataclasses import dataclass, replace
 from typing import Optional
 
-from chia_rs import ConsensusConstants, SpendBundle
+from chia_rs import ConsensusConstants, SpendBundle, check_time_locks
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
-from chia_rs import check_time_locks
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.types.blockchain_format.coin import Coin

chia/_tests/core/full_node/stores/test_coin_store.py

@@ -186,16 +186,16 @@ async def test_set_spent(db_version: int, bt: BlockTools) -> None:
             coins = block.get_included_reward_coins()
             records = [await coin_store.get_coin_record(coin.name()) for coin in coins]
 
-            await coin_store._set_spent([r.name for r in records if r is not None], block.height)
+            await coin_store._set_spent([r.name() for r in records if r is not None], block.height)
 
             if len(records) > 0:
                 for r in records:
                     assert r is not None
-                    assert (await coin_store.get_coin_record(r.name)) is not None
+                    assert (await coin_store.get_coin_record(r.name())) is not None
 
                 # Check that we can't spend a coin twice in DB
                 with pytest.raises(ValueError, match="Invalid operation to set spent"):
-                    await coin_store._set_spent([r.name for r in records if r is not None], block.height)
+                    await coin_store._set_spent([r.name() for r in records if r is not None], block.height)
 
             records = [await coin_store.get_coin_record(coin.name()) for coin in coins]
             for record in records:
@@ -303,7 +303,7 @@ async def test_rollback(db_version: int, bt: BlockTools) -> None:
             if block.height <= reorg_index:
                 for record in records:
                     assert record is not None
-                    assert record.spent() == (record.name != selected_coin.name)
+                    assert record.spent() == (record.name() != selected_coin.name())
             else:
                 for record in records:
                     assert record is None

chia/_tests/core/mempool/test_mempool_manager.py

@@ -17,6 +17,7 @@
     SpendBundle,
     SpendBundleConditions,
     SpendConditions,
+    check_time_locks,
     get_conditions_from_spendbundle,
     run_block_generator2,
 )
@@ -27,7 +28,6 @@
 from chia._tests.conftest import ConsensusMode
 from chia._tests.util.misc import Marks, datacases, invariant_check_mempool
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets, setup_simulators_and_wallets
-from chia_rs import check_time_locks
 from chia.consensus.condition_costs import ConditionCost
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.eligible_coin_spends import (

chia/_tests/wallet/test_transaction_store.py

@@ -867,7 +867,7 @@ async def test_valid_times_migration() -> None:
                 "INSERT OR REPLACE INTO transaction_record VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 (
                     bytes(old_record),
-                    old_record.name,
+                    old_record.namex,
                     old_record.confirmed_at_height,
                     old_record.created_at_time,
                     old_record.to_puzzle_hash.hex(),

chia/consensus/block_body_validation.py

@@ -12,6 +12,7 @@
     FullBlock,
     SpendBundleConditions,
     UnfinishedBlock,
+    check_time_locks,
     compute_merkle_set_root,
     is_canonical_serialization,
 )
@@ -21,7 +22,6 @@
 
 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
-from chia_rs import check_time_locks
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
 from chia.types.coin_record import CoinRecord

chia/full_node/mempool_manager.py

@@ -15,6 +15,7 @@
     ConsensusConstants,
     SpendBundle,
     SpendBundleConditions,
+    check_time_locks,
     supports_fast_forward,
     validate_clvm_and_signature,
 )
@@ -23,7 +24,6 @@
 from chiabip158 import PyBIP158
 
 from chia.consensus.block_record import BlockRecordProtocol
-from chia_rs import check_time_locks
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bitcoin_fee_estimator import create_bitcoin_fee_estimator
 from chia.full_node.fee_estimation import FeeBlockInfo, MempoolInfo, MempoolItemInfo

chia/types/coin_record.py

@@ -1,15 +1,5 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-from typing import Optional
-
-from chia_rs import CoinState
-from chia_rs.sized_bytes import bytes32
-from chia_rs.sized_ints import uint32, uint64
-
-from chia.types.blockchain_format.coin import Coin
-from chia.util.streamable import Streamable, streamable
-
 from chia_rs import CoinRecord as RustCoinRecord
 
-CoinRecord = RustCoinRecord
+CoinRecord = RustCoinRecord