remove chia.util.clvm pass-through file (#10130)

* remove chia.util.clvm pass-through file

* in tests too

chia/full_node/mempool_manager.py

@@ -7,6 +7,7 @@ from concurrent.futures.process import ProcessPoolExecutor
 from typing import Dict, List, Optional, Set, Tuple
 from blspy import GTElement
 from chiabip158 import PyBIP158
+from clvm.casts import int_from_bytes
 
 from chia.util import cached_bls
 from chia.consensus.block_record import BlockRecord
@@ -27,7 +28,6 @@ from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.mempool_item import MempoolItem
 from chia.types.spend_bundle import SpendBundle
 from chia.util.cached_bls import LOCAL_CACHE
-from chia.util.clvm import int_from_bytes
 from chia.util.condition_tools import pkm_pairs
 from chia.util.errors import Err, ValidationError
 from chia.util.generator_tools import additions_for_npc

chia/types/blockchain_format/coin.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
 from typing import Any, List
 
+from clvm.casts import int_to_bytes
+
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.clvm import int_to_bytes
 from chia.util.hash import std_hash
 from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable

chia/util/clvm.py

@@ -1 +0,0 @@
-from clvm.casts import int_from_bytes, int_to_bytes  # noqa

chia/util/condition_tools.py

@@ -1,5 +1,7 @@
 from typing import Dict, List, Optional, Tuple, Set
 
+from clvm.casts import int_from_bytes
+
 from chia.types.announcement import Announcement
 from chia.types.name_puzzle_condition import NPC
 from chia.types.blockchain_format.coin import Coin
@@ -7,7 +9,6 @@ from chia.types.blockchain_format.program import Program, SerializedProgram
 from chia.types.blockchain_format.sized_bytes import bytes32, bytes48
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
-from chia.util.clvm import int_from_bytes
 from chia.util.errors import ConsensusError, Err
 from chia.util.ints import uint64
 

tests/core/full_node/test_full_node.py

@@ -8,6 +8,7 @@ from secrets import token_bytes
 from typing import Dict, Optional, List
 from blspy import G2Element
 
+from clvm.casts import int_to_bytes
 import pytest
 
 from chia.consensus.blockchain import ReceiveBlockResult
@@ -34,7 +35,6 @@ from chia.types.peer_info import PeerInfo, TimestampedPeerInfo
 from chia.types.spend_bundle import SpendBundle
 from chia.types.unfinished_block import UnfinishedBlock
 from tests.block_tools import get_signage_point
-from chia.util.clvm import int_to_bytes
 from chia.util.errors import Err
 from chia.util.hash import std_hash
 from chia.util.ints import uint8, uint16, uint32, uint64

tests/core/full_node/test_mempool.py

@@ -5,6 +5,7 @@ from time import time
 
 from typing import Dict, List, Optional, Tuple, Callable
 
+from clvm.casts import int_to_bytes
 import pytest
 
 import chia.server.ws_connection as ws
@@ -23,7 +24,6 @@ from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle
 from chia.types.mempool_item import MempoolItem
-from chia.util.clvm import int_to_bytes
 from chia.util.condition_tools import conditions_for_solution, pkm_pairs
 from chia.util.errors import Err
 from chia.util.ints import uint64, uint32

tests/core/full_node/test_performance.py

@@ -6,6 +6,7 @@ import random
 import time
 from typing import Dict
 
+from clvm.casts import int_to_bytes
 import pytest
 import cProfile
 
@@ -15,7 +16,6 @@ from chia.protocols import full_node_protocol as fnp
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.unfinished_block import UnfinishedBlock
-from chia.util.clvm import int_to_bytes
 from chia.util.ints import uint64
 from tests.wallet_tools import WalletTool
 

tests/generator/test_rom.py

@@ -1,3 +1,4 @@
+from clvm.casts import int_to_bytes
 from clvm_tools import binutils
 from clvm_tools.clvmc import compile_clvm_text
 
@@ -8,7 +9,6 @@ from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.name_puzzle_condition import NPC
 from chia.types.generator_types import BlockGenerator
-from chia.util.clvm import int_to_bytes
 from chia.util.condition_tools import ConditionOpcode
 from chia.util.ints import uint32
 from chia.wallet.puzzles.load_clvm import load_clvm

tests/wallet_tools.py

@@ -1,6 +1,7 @@
 from typing import Dict, List, Optional, Tuple, Any
 
 from blspy import AugSchemeMPL, G2Element, PrivateKey
+from clvm.casts import int_from_bytes, int_to_bytes
 
 from chia.consensus.constants import ConsensusConstants
 from chia.util.hash import std_hash
@@ -12,7 +13,6 @@ from chia.types.coin_spend import CoinSpend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle
-from chia.util.clvm import int_from_bytes, int_to_bytes
 from chia.util.condition_tools import conditions_by_opcode, conditions_for_solution
 from chia.util.ints import uint32, uint64
 from chia.wallet.derive_keys import master_sk_to_wallet_sk