chia-blockchain 2.5.2rc2__py3-none-any.whl → 2.5.3rc1__py3-none-any.whl

chia/_tests/core/test_farmer_harvester_rpc.py

@@ -13,6 +13,8 @@ from shutil import copy
 from typing import Any, Callable, Union, cast
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.conftest import HarvesterFarmerEnvironment
 from chia._tests.plot_sync.test_delta import dummy_plot
@@ -34,11 +36,9 @@ from chia.rpc.farmer_rpc_api import (
 )
 from chia.rpc.farmer_rpc_client import FarmerRpcClient
 from chia.simulator.block_tools import get_plot_dir
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
 from chia.util.config import load_config, lock_and_load_config, save_config
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.wallet.derive_keys import master_sk_to_wallet_sk, master_sk_to_wallet_sk_unhardened
 
 log = logging.getLogger(__name__)

chia/_tests/core/test_full_node_rpc.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import pytest
 from chia_rs import AugSchemeMPL
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8
 from clvm.casts import int_to_bytes
 
 from chia import __version__
@@ -22,14 +24,12 @@ from chia.simulator.simulator_protocol import FarmNewBlockProtocol, ReorgProtoco
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import compute_additions
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.full_block import FullBlock
 from chia.types.unfinished_block import UnfinishedBlock
 from chia.util.hash import std_hash
-from chia.util.ints import uint8
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
 

chia/_tests/core/test_merkle_set.py

@@ -9,12 +9,12 @@ from typing import Optional
 
 import pytest
 from chia_rs import Coin, MerkleSet, compute_merkle_set_root, confirm_included_already_hashed
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.simulator.block_tools import BlockTools
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.batches import to_batches
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 from chia.wallet.util.wallet_sync_utils import validate_additions, validate_removals
 
 

chia/_tests/core/test_program.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 from clvm.SExp import CastableType
 from clvm_tools import binutils
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 
 
 def program_roundtrip(o: CastableType) -> None:

chia/_tests/core/test_rpc_util.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 import pytest
+from chia_rs.sized_ints import uint32
 
 from chia.rpc.util import marshal
-from chia.util.ints import uint32
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.util.clvm_streamable import clvm_streamable
 

chia/_tests/core/test_seeder.py

@@ -9,6 +9,7 @@ from unittest.mock import AsyncMock
 
 import dns
 import pytest
+from chia_rs.sized_ints import uint32, uint64
 from dns.name import from_text
 from dns.rdataclass import IN
 from dns.rdatatype import AAAA as AAAA_TYPE
@@ -19,7 +20,6 @@ from dns.rrset import RRset
 
 from chia.seeder.dns_server import DNSServer
 from chia.seeder.peer_record import PeerRecord, PeerReliability
-from chia.util.ints import uint32, uint64
 
 timeout = 0.5
 

chia/_tests/core/util/test_block_cache.py

@@ -4,11 +4,11 @@ import random
 from dataclasses import dataclass
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia.consensus.block_record import BlockRecord
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.block_cache import BlockCache
-from chia.util.ints import uint32
 
 
 @dataclass
@@ -40,5 +40,5 @@ async def test_block_cache(seeded_random: random.Random) -> None:
         assert a.block_record(hh) == BR(i + 1, hh, hashes[i - 1])
         assert a.height_to_hash(uint32(i + 1)) == hh
         assert a.height_to_block_record(uint32(i + 1)) == BR(i + 1, hh, hashes[i - 1])
-        assert a.contains_block(hh)
+        assert a.contains_block(hh, uint32(i + 1))
         assert a.contains_height(uint32(i + 1))

chia/_tests/core/util/test_jsonify.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Optional
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.util.streamable import Streamable, recurse_jsonify, streamable
 
 

chia/_tests/core/util/test_keychain.py

@@ -8,10 +8,11 @@ from typing import Callable, Optional
 import importlib_resources
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 import chia._tests.util
 from chia.simulator.keyring import TempKeyring
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.errors import (
     KeychainFingerprintExists,
     KeychainFingerprintNotFound,
@@ -20,7 +21,6 @@ from chia.util.errors import (
     KeychainLabelInvalid,
     KeychainSecretsMissing,
 )
-from chia.util.ints import uint32
 from chia.util.keychain import (
     Keychain,
     KeyData,
@@ -233,7 +233,7 @@ class TestKeychain:
         # Test code from trezor:
         # Copyright (c) 2013 Pavol Rusnak
         # Copyright (c) 2017 mruddy
-        # https://github.com/trezor/python-mnemonic/blob/master/test_mnemonic.py
+        # https://github.com/trezor/python-mnemonic/blob/master/tests/test_mnemonic.py
         # The same sentence in various UTF-8 forms
         words_nfkd = "Pr\u030ci\u0301s\u030cerne\u030c z\u030clut\u030couc\u030cky\u0301 ku\u030an\u030c u\u0301pe\u030cl d\u030ca\u0301belske\u0301 o\u0301dy za\u0301ker\u030cny\u0301 uc\u030cen\u030c be\u030cz\u030ci\u0301 pode\u0301l zo\u0301ny u\u0301lu\u030a"  # noqa: E501
         words_nfc = "P\u0159\xed\u0161ern\u011b \u017elu\u0165ou\u010dk\xfd k\u016f\u0148 \xfap\u011bl \u010f\xe1belsk\xe9 \xf3dy z\xe1ke\u0159n\xfd u\u010de\u0148 b\u011b\u017e\xed pod\xe9l z\xf3ny \xfal\u016f"  # noqa: E501

chia/_tests/core/util/test_streamable.py

@@ -6,7 +6,9 @@ from dataclasses import dataclass, field, fields
 from typing import Any, Callable, Optional, get_type_hints
 
 import pytest
-from chia_rs import G1Element
+from chia_rs import G1Element, SubEpochChallengeSegment
+from chia_rs.sized_bytes import bytes4, bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 from clvm_tools import binutils
 from typing_extensions import Literal, get_args
 
@@ -14,10 +16,7 @@ from chia.protocols.wallet_protocol import RespondRemovals
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes4, bytes32
 from chia.types.full_block import FullBlock
-from chia.types.weight_proof import SubEpochChallengeSegment
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.streamable import (
     ConversionError,
     DefinitionError,

chia/_tests/environments/wallet.py

@@ -8,6 +8,9 @@ from collections.abc import Iterator
 from dataclasses import asdict, dataclass, field
 from typing import TYPE_CHECKING, Any, ClassVar, Union, cast
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia._tests.environments.common import ServiceEnvironment
 from chia.cmds.cmd_helpers import NeedsTXConfig, NeedsWalletRPC, TransactionEndpoint, TransactionsOut, WalletClientInfo
 from chia.cmds.param_types import CliAmount, cli_amount_none
@@ -18,8 +21,6 @@ from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.server.server import ChiaServer
 from chia.server.start_service import Service
 from chia.simulator.full_node_simulator import FullNodeSimulator
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 from chia.wallet.transaction_record import LightTransactionRecord
 from chia.wallet.util.transaction_type import CLAWBACK_INCOMING_TRANSACTION_TYPES
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig

chia/_tests/farmer_harvester/test_farmer.py

@@ -10,6 +10,8 @@ from unittest.mock import ANY
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 from pytest_mock import MockerFixture
 from yarl import URL
 
@@ -30,10 +32,8 @@ from chia.types.blockchain_format.proof_of_space import (
     generate_plot_public_key,
     verify_and_get_quality_string,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.config import load_config, save_config
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64
 
 log = logging.getLogger(__name__)
 
@@ -191,8 +191,7 @@ class NewProofOfSpaceCase:
             plot_challenge=bytes32.fromhex("7580e4c366dc2c94c37ce44943f9629a3cd6e027d7b24cd014adeaa578d4b0a2"),
             plot_public_key=G1Element.from_bytes(
                 bytes.fromhex(
-                    "a6126295fbf0f50dbed8dc41e236241413fdc8a97e650e3e"
-                    "d69d66d0921d3236f8961cc1cf8c1b195521c2d9143048e2"
+                    "a6126295fbf0f50dbed8dc41e236241413fdc8a97e650e3ed69d66d0921d3236f8961cc1cf8c1b195521c2d9143048e2"
                 )
             ),
             pool_public_key=None,

chia/_tests/farmer_harvester/test_farmer_harvester.py

@@ -7,6 +7,8 @@ from typing import Any, Optional
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.conftest import HarvesterFarmerEnvironment
 from chia._tests.util.split_managers import split_async_manager
@@ -20,11 +22,9 @@ from chia.rpc.harvester_rpc_client import HarvesterRpcClient
 from chia.server.outbound_message import NodeType, make_msg
 from chia.simulator.block_tools import BlockTools
 from chia.types.aliases import FarmerService, HarvesterService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.config import load_config
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.keychain import generate_mnemonic
 
 

chia/_tests/farmer_harvester/test_filter_prefix_bits.py

@@ -5,6 +5,8 @@ from pathlib import Path
 from typing import Any, Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.conftest import ConsensusMode
 from chia._tests.core.test_farmer_harvester_rpc import wait_for_plot_sync
@@ -17,9 +19,7 @@ from chia.rpc.harvester_rpc_client import HarvesterRpcClient
 from chia.simulator.block_tools import create_block_tools_async, test_constants
 from chia.types.aliases import HarvesterService
 from chia.types.blockchain_format.proof_of_space import get_plot_id, passes_plot_filter
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.keychain import Keychain
 
 

chia/_tests/farmer_harvester/test_third_party_harvesters.py

@@ -10,7 +10,9 @@ from os.path import dirname
 from typing import Optional, Union, cast
 
 import pytest
-from chia_rs import G1Element
+from chia_rs import FoliageBlockData, FoliageTransactionBlock, G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.util.misc import patch_request_handler
 from chia._tests.util.time_out_assert import time_out_assert
@@ -34,9 +36,7 @@ from chia.simulator.block_tools import BlockTools
 from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.types.aliases import FarmerService, FullNodeService, HarvesterService
 from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.foliage import FoliageBlockData, FoliageTransactionBlock
 from chia.types.blockchain_format.proof_of_space import ProofOfSpace
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.slots import ChallengeChainSubSlot, RewardChainSubSlot
 from chia.types.full_block import FullBlock
 from chia.types.peer_info import UnresolvedPeerInfo
@@ -44,7 +44,6 @@ from chia.types.validation_state import ValidationState
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.bech32m import decode_puzzle_hash
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 
 SPType = Union[timelord_protocol.NewEndOfSubSlotVDF, timelord_protocol.NewSignagePointVDF]
 SPList = list[SPType]

chia/_tests/fee_estimation/test_fee_estimation_integration.py

@@ -4,6 +4,7 @@ import types
 
 import pytest
 from chia_rs import Coin
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.core.mempool.test_mempool_manager import (
     create_test_block_record,
@@ -28,7 +29,6 @@ from chia.types.clvm_cost import CLVMCost
 from chia.types.fee_rate import FeeRate, FeeRateV2
 from chia.types.mempool_item import MempoolItem
 from chia.types.spend_bundle_conditions import SpendBundleConditions, SpendConditions
-from chia.util.ints import uint32, uint64
 
 
 def make_mempoolitem() -> MempoolItem:

chia/_tests/fee_estimation/test_fee_estimation_rpc.py

@@ -4,6 +4,8 @@ import re
 from typing import Any
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.rpc.full_node_rpc_api import FullNodeRpcApi
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
@@ -14,9 +16,7 @@ from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.aliases import WalletService
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 
 
 @pytest.fixture(scope="function")

chia/_tests/fee_estimation/test_fee_estimation_unit_tests.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import logging
 
 import pytest
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.full_node.bitcoin_fee_estimator import create_bitcoin_fee_estimator
 from chia.full_node.fee_estimation import FeeBlockInfo, MempoolItemInfo
@@ -10,7 +11,6 @@ from chia.full_node.fee_estimator_constants import INFINITE_FEE_RATE, INITIAL_ST
 from chia.full_node.fee_estimator_interface import FeeEstimatorInterface
 from chia.full_node.fee_tracker import get_bucket_index, init_buckets
 from chia.types.fee_rate import FeeRateV2
-from chia.util.ints import uint32, uint64
 from chia.util.math import make_monotonically_decreasing
 
 log = logging.getLogger(__name__)

chia/_tests/fee_estimation/test_mempoolitem_height_added.py

@@ -4,17 +4,16 @@ import logging
 from typing import Callable, Optional
 
 import pytest
-from chia_rs import Coin, G2Element
+from chia_rs import Coin, ConsensusConstants, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint64
 
 from chia._tests.util.spend_sim import SimClient, SpendSim, sim_and_client
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.bitcoin_fee_estimator import BitcoinFeeEstimator
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import make_spend
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint8, uint64
 
 log = logging.getLogger(__name__)
 

chia/_tests/generator/test_compression.py

@@ -4,7 +4,16 @@ from __future__ import annotations
 import io
 from typing import Any
 
+from chia_puzzles_py.programs import (
+    BLOCK_PROGRAM_ZERO,
+    CHIALISP_DESERIALISATION,
+    DECOMPRESS_COIN_SPEND_ENTRY,
+    DECOMPRESS_COIN_SPEND_ENTRY_WITH_PREFIX,
+    DECOMPRESS_PUZZLE,
+    ROM_BOOTSTRAP_GENERATOR,
+)
 from chia_rs import serialized_length
+from chia_rs.sized_ints import uint32
 from clvm.serialize import sexp_from_stream
 from clvm.SExp import SExp
 from clvm_tools import binutils
@@ -12,21 +21,22 @@ from clvm_tools import binutils
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.types.spend_bundle import SpendBundle
 from chia.util.byte_types import hexstr_to_bytes
-from chia.util.ints import uint32
 from chia.wallet.puzzles.load_clvm import load_clvm
 
-TEST_GEN_DESERIALIZE = load_clvm(
-    "test_generator_deserialize.clsp", package_or_requirement="chia._tests.generator.puzzles"
-)
-DESERIALIZE_MOD = load_clvm("chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles")
+DESERIALIZE_MOD = Program.from_bytes(CHIALISP_DESERIALISATION)
+
+GENERATOR_MOD: Program = Program.from_bytes(ROM_BOOTSTRAP_GENERATOR)
 
-DECOMPRESS_PUZZLE = load_clvm("decompress_puzzle.clsp", package_or_requirement="chia.full_node.puzzles")
-DECOMPRESS_CSE = load_clvm("decompress_coin_spend_entry.clsp", package_or_requirement="chia.full_node.puzzles")
 
-DECOMPRESS_CSE_WITH_PREFIX = load_clvm(
-    "decompress_coin_spend_entry_with_prefix.clsp", package_or_requirement="chia.full_node.puzzles"
+DECOMPRESS_PUZZLE = Program.from_bytes(DECOMPRESS_PUZZLE)
+DECOMPRESS_CSE = Program.from_bytes(DECOMPRESS_COIN_SPEND_ENTRY)
+
+DECOMPRESS_CSE_WITH_PREFIX = Program.from_bytes(DECOMPRESS_COIN_SPEND_ENTRY_WITH_PREFIX)
+DECOMPRESS_BLOCK = Program.from_bytes(BLOCK_PROGRAM_ZERO)
+
+TEST_GEN_DESERIALIZE = load_clvm(
+    "test_generator_deserialize.clsp", package_or_requirement="chia._tests.generator.puzzles"
 )
-DECOMPRESS_BLOCK = load_clvm("block_program_zero.clsp", package_or_requirement="chia.full_node.puzzles")
 TEST_MULTIPLE = load_clvm(
     "test_multiple_generator_input_arguments.clsp", package_or_requirement="chia._tests.generator.puzzles"
 )

chia/_tests/generator/test_rom.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSTRAP_GENERATOR
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 from clvm.CLVMObject import CLVMStorage
 from clvm_tools import binutils
 from clvm_tools.clvmc import compile_clvm_text
@@ -9,20 +12,15 @@ from chia.consensus.condition_costs import ConditionCost
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.generator_types import BlockGenerator
 from chia.types.spend_bundle_conditions import SpendConditions
-from chia.util.ints import uint32
-from chia.wallet.puzzles.load_clvm import load_clvm, load_serialized_clvm_maybe_recompile
 
-MAX_COST = 10**15
-COST_PER_BYTE = 12000
+DESERIALIZE_MOD = Program.from_bytes(CHIALISP_DESERIALISATION)
 
+GENERATOR_MOD: SerializedProgram = SerializedProgram.from_bytes(ROM_BOOTSTRAP_GENERATOR)
 
-DESERIALIZE_MOD = load_clvm("chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles")
-GENERATOR_MOD: SerializedProgram = load_serialized_clvm_maybe_recompile(
-    "rom_bootstrap_generator.clsp", package_or_requirement="chia.consensus.puzzles"
-)
+MAX_COST = 10**15
+COST_PER_BYTE = 12000
 
 
 GENERATOR_CODE = """

chia/_tests/plot_sync/test_delta.py

@@ -4,11 +4,11 @@ import logging
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint64
 
 from chia.plot_sync.delta import Delta, DeltaType, PathListDelta, PlotListDelta
 from chia.protocols.harvester_protocol import Plot
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint64
 
 log = logging.getLogger(__name__)
 

chia/_tests/plot_sync/test_plot_sync.py

@@ -11,6 +11,8 @@ from typing import Any, Callable, Optional
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.plot_sync.util import start_harvester_service
 from chia._tests.plotting.test_plot_manager import Directory, MockPlotInfo
@@ -29,9 +31,7 @@ from chia.protocols.harvester_protocol import Plot
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.simulator.block_tools import BlockTools
 from chia.types.aliases import FarmerService, HarvesterService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.config import create_default_chia_config, lock_and_load_config, save_config
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.streamable import _T_Streamable
 
 

chia/_tests/plot_sync/test_receiver.py

@@ -8,6 +8,8 @@ from typing import Any, Callable, Union
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.plot_sync.util import get_dummy_connection
 from chia.consensus.pos_quality import UI_ACTUAL_SPACE_CONSTANT_FACTOR, _expected_plot_size
@@ -25,8 +27,6 @@ from chia.protocols.harvester_protocol import (
     PlotSyncStart,
 )
 from chia.server.outbound_message import NodeType
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.streamable import _T_Streamable
 
 log = logging.getLogger(__name__)

chia/_tests/plot_sync/test_sender.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import random
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import int16, uint64
 
 from chia._tests.plot_sync.util import get_dummy_connection, plot_sync_identifier
 from chia.plot_sync.exceptions import AlreadyStartedError, InvalidConnectionTypeError
@@ -13,8 +15,6 @@ from chia.protocols.harvester_protocol import PlotSyncIdentifier, PlotSyncRespon
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.server.outbound_message import NodeType
 from chia.simulator.block_tools import BlockTools
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import int16, uint64
 
 
 def test_default_values(bt: BlockTools) -> None:

chia/_tests/plot_sync/test_sync_simulated.py

@@ -14,6 +14,8 @@ from typing import Any, Optional
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import int16, uint8, uint64
 
 from chia._tests.plot_sync.util import start_harvester_service
 from chia._tests.util.time_out_assert import time_out_assert
@@ -30,9 +32,7 @@ from chia.server.outbound_message import make_msg
 from chia.server.ws_connection import WSChiaConnection
 from chia.simulator.block_tools import BlockTools
 from chia.types.aliases import FarmerService, HarvesterService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.batches import to_batches
-from chia.util.ints import int16, uint8, uint64
 
 log = logging.getLogger(__name__)
 

chia/_tests/plot_sync/util.py

@@ -6,6 +6,9 @@ from collections.abc import AsyncIterator
 from dataclasses import dataclass
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint64
+
 from chia._tests.util.split_managers import SplitAsyncManager, split_async_manager
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.harvester.harvester import Harvester
@@ -13,9 +16,7 @@ from chia.plot_sync.sender import Sender
 from chia.protocols.harvester_protocol import PlotSyncIdentifier
 from chia.server.outbound_message import Message, NodeType
 from chia.types.aliases import FarmerService, HarvesterService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import PeerInfo, UnresolvedPeerInfo
-from chia.util.ints import uint16, uint64
 
 
 @dataclass

chia/_tests/plotting/test_plot_manager.py

@@ -12,6 +12,7 @@ from typing import Callable, Optional, cast
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_ints import uint16, uint32
 
 from chia._tests.plotting.util import get_test_plots
 from chia._tests.util.misc import boolean_datacases
@@ -29,7 +30,6 @@ from chia.plotting.util import (
 )
 from chia.simulator.block_tools import get_plot_dir
 from chia.util.config import create_default_chia_config, lock_and_load_config, save_config
-from chia.util.ints import uint16, uint32
 from chia.util.streamable import VersionedBlob
 
 log = logging.getLogger(__name__)

chia/_tests/pools/test_pool_cli_parsing.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia._tests.cmds.test_cmd_framework import check_click_parsing
 from chia.cmds.cmd_classes import ChiaCliContext
 from chia.cmds.cmd_helpers import NeedsWalletRPC
@@ -14,9 +17,7 @@ from chia.cmds.plotnft import (
     LeavePlotNFTCMD,
     ShowPlotNFTCMD,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint64
 from chia.wallet.util.address_type import AddressType
 
 

chia/_tests/pools/test_pool_cmdline.py

@@ -7,6 +7,8 @@ from typing import Optional, cast
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from pytest_mock import MockerFixture
@@ -38,11 +40,9 @@ from chia.pools.pool_config import PoolWalletConfig, load_pool_config, update_po
 from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.simulator.setup_services import setup_farmer
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import lock_and_load_config, save_config
 from chia.util.errors import CliRpcConnectionError
-from chia.util.ints import uint64
 from chia.wallet.util.address_type import AddressType
 from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_state_manager import WalletStateManager