diff --git a/chia/_tests/cmds/test_farm_cmd.py b/chia/_tests/cmds/test_farm_cmd.py index 286547d50caa..968152331e7b 100644 --- a/chia/_tests/cmds/test_farm_cmd.py +++ b/chia/_tests/cmds/test_farm_cmd.py @@ -9,9 +9,9 @@ from chia.cmds.farm_funcs import summary from chia.farmer.farmer import Farmer from chia.harvester.harvester import Harvester +from chia.server.aliases import FarmerService, HarvesterService, WalletService from chia.simulator.block_tools import BlockTools from chia.simulator.start_simulator import SimulatorFullNodeService -from chia.types.aliases import FarmerService, HarvesterService, WalletService @pytest.mark.anyio diff --git a/chia/_tests/conftest.py b/chia/_tests/conftest.py index d7d0f2f17079..c6f19439f2e5 100644 --- a/chia/_tests/conftest.py +++ b/chia/_tests/conftest.py @@ -53,6 +53,14 @@ from chia.rpc.harvester_rpc_client import HarvesterRpcClient from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.seeder.dns_server import DNSServer +from chia.server.aliases import ( + CrawlerService, + FarmerService, + FullNodeService, + HarvesterService, + TimelordService, + WalletService, +) from chia.server.server import ChiaServer from chia.server.start_service import Service from chia.simulator.full_node_simulator import FullNodeSimulator @@ -66,16 +74,6 @@ ) from chia.simulator.start_simulator import SimulatorFullNodeService from chia.simulator.wallet_tools import WalletTool - -# Set spawn after stdlib imports, but before other imports -from chia.types.aliases import ( - CrawlerService, - FarmerService, - FullNodeService, - HarvesterService, - TimelordService, - WalletService, -) from chia.types.peer_info import PeerInfo from chia.util.config import create_default_chia_config, lock_and_load_config from chia.util.db_wrapper import generate_in_memory_db_uri @@ -85,6 +83,7 @@ from chia.util.task_timing import start_task_instrumentation, stop_task_instrumentation from chia.wallet.wallet_node import WalletNode +# Set spawn after stdlib imports, but before other imports multiprocessing.set_start_method("spawn") from dataclasses import replace diff --git a/chia/_tests/core/data_layer/test_data_rpc.py b/chia/_tests/core/data_layer/test_data_rpc.py index 46e5dd5a701b..98fc2c2593f6 100644 --- a/chia/_tests/core/data_layer/test_data_rpc.py +++ b/chia/_tests/core/data_layer/test_data_rpc.py @@ -55,11 +55,11 @@ from chia.rpc.data_layer_rpc_api import DataLayerRpcApi from chia.rpc.data_layer_rpc_client import DataLayerRpcClient from chia.rpc.wallet_rpc_api import WalletRpcApi +from chia.server.aliases import DataLayerService, WalletService from chia.server.start_data_layer import create_data_layer_service from chia.simulator.block_tools import BlockTools from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol -from chia.types.aliases import DataLayerService, WalletService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.byte_types import hexstr_to_bytes diff --git a/chia/_tests/core/full_node/test_full_node.py b/chia/_tests/core/full_node/test_full_node.py index 2ab729557358..4f171ffeba11 100644 --- a/chia/_tests/core/full_node/test_full_node.py +++ b/chia/_tests/core/full_node/test_full_node.py @@ -38,8 +38,9 @@ from chia.full_node.full_node_api import FullNodeAPI from chia.full_node.signage_point import SignagePoint from chia.full_node.sync_store import Peak -from chia.protocols import full_node_protocol, timelord_protocol, wallet_protocol +from chia.protocols import full_node_protocol from chia.protocols import full_node_protocol as fnp +from chia.protocols import timelord_protocol, wallet_protocol from chia.protocols.full_node_protocol import RespondTransaction from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.protocols.shared_protocol import Capability, default_capabilities diff --git a/chia/_tests/core/test_crawler.py b/chia/_tests/core/test_crawler.py index 7b3486a7a18e..808b86b19fac 100644 --- a/chia/_tests/core/test_crawler.py +++ b/chia/_tests/core/test_crawler.py @@ -14,8 +14,8 @@ from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.protocols.wallet_protocol import RequestChildren from chia.seeder.peer_record import PeerRecord, PeerReliability +from chia.server.aliases import CrawlerService from chia.server.outbound_message import make_msg -from chia.types.aliases import CrawlerService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.ints import uint32, uint64, uint128 diff --git a/chia/_tests/farmer_harvester/test_farmer.py b/chia/_tests/farmer_harvester/test_farmer.py index 28f9e4ebcab0..2d08f7b2f155 100644 --- a/chia/_tests/farmer_harvester/test_farmer.py +++ b/chia/_tests/farmer_harvester/test_farmer.py @@ -22,9 +22,9 @@ from chia.protocols import farmer_protocol, harvester_protocol from chia.protocols.harvester_protocol import NewProofOfSpace, RespondSignatures from chia.protocols.pool_protocol import PoolErrorCode +from chia.server.aliases import FarmerService, HarvesterService 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.proof_of_space import ( ProofOfSpace, generate_plot_public_key, diff --git a/chia/_tests/farmer_harvester/test_farmer_harvester.py b/chia/_tests/farmer_harvester/test_farmer_harvester.py index 66df1f3d508a..b67598dc8736 100644 --- a/chia/_tests/farmer_harvester/test_farmer_harvester.py +++ b/chia/_tests/farmer_harvester/test_farmer_harvester.py @@ -17,9 +17,9 @@ from chia.protocols import farmer_protocol, harvester_protocol from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.rpc.harvester_rpc_client import HarvesterRpcClient +from chia.server.aliases import FarmerService, HarvesterService 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 diff --git a/chia/_tests/farmer_harvester/test_filter_prefix_bits.py b/chia/_tests/farmer_harvester/test_filter_prefix_bits.py index d5c1d21ef518..d33f807fd483 100644 --- a/chia/_tests/farmer_harvester/test_filter_prefix_bits.py +++ b/chia/_tests/farmer_harvester/test_filter_prefix_bits.py @@ -14,8 +14,8 @@ from chia.protocols import farmer_protocol from chia.rpc.farmer_rpc_client import FarmerRpcClient from chia.rpc.harvester_rpc_client import HarvesterRpcClient +from chia.server.aliases import HarvesterService 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 diff --git a/chia/_tests/farmer_harvester/test_third_party_harvesters.py b/chia/_tests/farmer_harvester/test_third_party_harvesters.py index c3bc41fcc508..203a1dafa660 100644 --- a/chia/_tests/farmer_harvester/test_third_party_harvesters.py +++ b/chia/_tests/farmer_harvester/test_third_party_harvesters.py @@ -27,12 +27,12 @@ from chia.protocols import farmer_protocol, full_node_protocol, harvester_protocol, timelord_protocol from chia.protocols.harvester_protocol import ProofOfSpaceFeeInfo, RespondSignatures, SigningDataKind from chia.protocols.protocol_message_types import ProtocolMessageTypes +from chia.server.aliases import FarmerService, FullNodeService, HarvesterService from chia.server.outbound_message import Message, NodeType, make_msg from chia.server.server import ChiaServer from chia.server.ws_connection import WSChiaConnection 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 diff --git a/chia/_tests/fee_estimation/test_fee_estimation_rpc.py b/chia/_tests/fee_estimation/test_fee_estimation_rpc.py index 288354aa6282..946ece44e8ee 100644 --- a/chia/_tests/fee_estimation/test_fee_estimation_rpc.py +++ b/chia/_tests/fee_estimation/test_fee_estimation_rpc.py @@ -7,12 +7,12 @@ from chia.rpc.full_node_rpc_api import FullNodeRpcApi from chia.rpc.full_node_rpc_client import FullNodeRpcClient +from chia.server.aliases import WalletService from chia.simulator.block_tools import BlockTools from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol 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 diff --git a/chia/_tests/plot_sync/test_plot_sync.py b/chia/_tests/plot_sync/test_plot_sync.py index 92398f57a3a5..2f5997d81013 100644 --- a/chia/_tests/plot_sync/test_plot_sync.py +++ b/chia/_tests/plot_sync/test_plot_sync.py @@ -27,8 +27,8 @@ from chia.plotting.util import add_plot_directory, remove_plot_directory from chia.protocols.harvester_protocol import Plot from chia.protocols.protocol_message_types import ProtocolMessageTypes +from chia.server.aliases import FarmerService, HarvesterService 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 diff --git a/chia/_tests/plot_sync/test_sync_simulated.py b/chia/_tests/plot_sync/test_sync_simulated.py index 736da9276af7..8c0ab58a0d11 100644 --- a/chia/_tests/plot_sync/test_sync_simulated.py +++ b/chia/_tests/plot_sync/test_sync_simulated.py @@ -26,10 +26,10 @@ from chia.plotting.util import PlotInfo from chia.protocols.harvester_protocol import PlotSyncError, PlotSyncResponse from chia.protocols.protocol_message_types import ProtocolMessageTypes +from chia.server.aliases import FarmerService, HarvesterService 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 diff --git a/chia/_tests/plot_sync/util.py b/chia/_tests/plot_sync/util.py index e59b110b6c3b..fa7097bb7cc3 100644 --- a/chia/_tests/plot_sync/util.py +++ b/chia/_tests/plot_sync/util.py @@ -11,8 +11,8 @@ from chia.harvester.harvester import Harvester from chia.plot_sync.sender import Sender from chia.protocols.harvester_protocol import PlotSyncIdentifier +from chia.server.aliases import FarmerService, HarvesterService 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 diff --git a/chia/_tests/pools/test_pool_rpc.py b/chia/_tests/pools/test_pool_rpc.py index 6fcaa6c150eb..42f84360576c 100644 --- a/chia/_tests/pools/test_pool_rpc.py +++ b/chia/_tests/pools/test_pool_rpc.py @@ -22,12 +22,12 @@ from chia.consensus.constants import ConsensusConstants from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo from chia.rpc.wallet_rpc_client import WalletRpcClient +from chia.server.aliases import WalletService from chia.simulator.add_blocks_in_batches import add_blocks_in_batches from chia.simulator.block_tools import BlockTools, get_plot_dir from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import ReorgProtocol from chia.simulator.start_simulator import SimulatorFullNodeService -from chia.types.aliases import WalletService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.bech32m import encode_puzzle_hash diff --git a/chia/_tests/timelord/test_new_peak.py b/chia/_tests/timelord/test_new_peak.py index 4827ad519248..57e5a7ff332f 100644 --- a/chia/_tests/timelord/test_new_peak.py +++ b/chia/_tests/timelord/test_new_peak.py @@ -12,11 +12,11 @@ from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty from chia.consensus.make_sub_epoch_summary import next_sub_epoch_summary from chia.protocols import timelord_protocol +from chia.server.aliases import FullNodeService from chia.server.server import ChiaServer from chia.simulator.block_tools import BlockTools from chia.simulator.full_node_simulator import FullNodeSimulator from chia.timelord.timelord_api import TimelordAPI -from chia.types.aliases import FullNodeService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.full_block import FullBlock diff --git a/chia/_tests/timelord/test_timelord.py b/chia/_tests/timelord/test_timelord.py index f0e0029a07ae..7e3dbec459ea 100644 --- a/chia/_tests/timelord/test_timelord.py +++ b/chia/_tests/timelord/test_timelord.py @@ -2,7 +2,7 @@ import pytest -from chia.types.aliases import TimelordService +from chia.server.aliases import TimelordService @pytest.mark.anyio diff --git a/chia/_tests/util/setup_nodes.py b/chia/_tests/util/setup_nodes.py index fb371c5dfe8a..e3606eeb5b15 100644 --- a/chia/_tests/util/setup_nodes.py +++ b/chia/_tests/util/setup_nodes.py @@ -21,6 +21,7 @@ from chia.introducer.introducer_api import IntroducerAPI from chia.protocols.shared_protocol import Capability from chia.rpc.wallet_rpc_client import WalletRpcClient +from chia.server.aliases import FarmerService, FullNodeService, HarvesterService, TimelordService, WalletService from chia.server.server import ChiaServer from chia.simulator.block_tools import BlockTools, create_block_tools_async from chia.simulator.full_node_simulator import FullNodeSimulator @@ -38,7 +39,6 @@ ) from chia.simulator.socket import find_available_listen_port from chia.simulator.start_simulator import SimulatorFullNodeService -from chia.types.aliases import FarmerService, FullNodeService, HarvesterService, TimelordService, WalletService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import UnresolvedPeerInfo from chia.util.hash import std_hash diff --git a/chia/_tests/wallet/dao_wallet/test_dao_clvm.py b/chia/_tests/wallet/dao_wallet/test_dao_clvm.py index a4a6c2120a29..44e70f30160a 100644 --- a/chia/_tests/wallet/dao_wallet/test_dao_clvm.py +++ b/chia/_tests/wallet/dao_wallet/test_dao_clvm.py @@ -30,6 +30,9 @@ DAO_PROPOSAL_VALIDATOR_MOD_HASH, DAO_TREASURY_MOD, DAO_TREASURY_MOD_HASH, +) +from chia.wallet.dao_wallet.dao_utils import DAO_UPDATE_PROPOSAL_MOD as DAO_UPDATE_MOD +from chia.wallet.dao_wallet.dao_utils import ( P2_SINGLETON_AGGREGATOR_MOD, P2_SINGLETON_MOD, SPEND_P2_SINGLETON_MOD, @@ -37,9 +40,6 @@ get_p2_singleton_puzhash, get_treasury_puzzle, ) -from chia.wallet.dao_wallet.dao_utils import ( - DAO_UPDATE_PROPOSAL_MOD as DAO_UPDATE_MOD, -) from chia.wallet.singleton import SINGLETON_LAUNCHER_PUZZLE_HASH as SINGLETON_LAUNCHER_HASH from chia.wallet.singleton import SINGLETON_TOP_LAYER_MOD as SINGLETON_MOD from chia.wallet.singleton import SINGLETON_TOP_LAYER_MOD_HASH as SINGLETON_MOD_HASH diff --git a/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py b/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py index 589ed0846963..01e83a51f01b 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py @@ -22,15 +22,9 @@ ) from chia.wallet.outer_puzzles import match_puzzle from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import puzzle_for_pk, solution_for_conditions -from chia.wallet.singleton import ( - SINGLETON_LAUNCHER_PUZZLE_HASH as LAUNCHER_PUZZLE_HASH, -) -from chia.wallet.singleton import ( - SINGLETON_TOP_LAYER_MOD as SINGLETON_MOD, -) -from chia.wallet.singleton import ( - SINGLETON_TOP_LAYER_MOD_HASH, -) +from chia.wallet.singleton import SINGLETON_LAUNCHER_PUZZLE_HASH as LAUNCHER_PUZZLE_HASH +from chia.wallet.singleton import SINGLETON_TOP_LAYER_MOD as SINGLETON_MOD +from chia.wallet.singleton import SINGLETON_TOP_LAYER_MOD_HASH from chia.wallet.trading.offer import OFFER_MOD_HASH from chia.wallet.uncurried_puzzle import uncurry_puzzle diff --git a/chia/_tests/wallet/test_new_wallet_protocol.py b/chia/_tests/wallet/test_new_wallet_protocol.py index 6560a43bd2c2..bfee7bbc7780 100644 --- a/chia/_tests/wallet/test_new_wallet_protocol.py +++ b/chia/_tests/wallet/test_new_wallet_protocol.py @@ -17,13 +17,13 @@ from chia.protocols import wallet_protocol from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.protocols.shared_protocol import Capability +from chia.server.aliases import WalletService from chia.server.outbound_message import Message, NodeType from chia.server.ws_connection import WSChiaConnection from chia.simulator import simulator_protocol from chia.simulator.block_tools import BlockTools from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.start_simulator import SimulatorFullNodeService -from chia.types.aliases import WalletService from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.mempool_inclusion_status import MempoolInclusionStatus diff --git a/chia/_tests/wallet/test_singleton.py b/chia/_tests/wallet/test_singleton.py index f73abd3c120b..2674a32a2a62 100644 --- a/chia/_tests/wallet/test_singleton.py +++ b/chia/_tests/wallet/test_singleton.py @@ -7,8 +7,9 @@ from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.condition_tools import parse_sexp_to_conditions from chia.wallet.conditions import AssertPuzzleAnnouncement -from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_MOD, SINGLETON_MOD, SINGLETON_MOD_HASH +from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_MOD from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH as LAUNCHER_PUZZLE_HASH +from chia.wallet.puzzles.singleton_top_layer import SINGLETON_MOD, SINGLETON_MOD_HASH LAUNCHER_ID = Program.to(b"launcher-id").get_tree_hash() POOL_REWARD_PREFIX_MAINNET = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a00000000000000000000000000000000") diff --git a/chia/_tests/wallet/test_singleton_lifecycle_fast.py b/chia/_tests/wallet/test_singleton_lifecycle_fast.py index 281e406c0c85..e13be02fb56b 100644 --- a/chia/_tests/wallet/test_singleton_lifecycle_fast.py +++ b/chia/_tests/wallet/test_singleton_lifecycle_fast.py @@ -18,12 +18,11 @@ from chia.types.condition_opcodes import ConditionOpcode from chia.util.ints import uint32, uint64 from chia.wallet.conditions import AssertCoinAnnouncement -from chia.wallet.puzzles.singleton_top_layer import ( - P2_SINGLETON_OR_DELAYED_MOD as P2_SINGLETON_MOD, -) +from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_OR_DELAYED_MOD as P2_SINGLETON_MOD from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_OR_DELAYED_MOD_HASH as P2_SINGLETON_MOD_HASH -from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER, SINGLETON_MOD, SINGLETON_MOD_HASH +from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH as LAUNCHER_PUZZLE_HASH +from chia.wallet.puzzles.singleton_top_layer import SINGLETON_MOD, SINGLETON_MOD_HASH from chia.wallet.util.debug_spend_bundle import debug_spend_bundle from chia.wallet.wallet_spend_bundle import WalletSpendBundle diff --git a/chia/cmds/cmd_classes.py b/chia/cmds/cmd_classes.py index 9c4d37b9a974..fdd6645ea34c 100644 --- a/chia/cmds/cmd_classes.py +++ b/chia/cmds/cmd_classes.py @@ -7,18 +7,7 @@ import pathlib import sys from dataclasses import MISSING, dataclass, field, fields -from typing import ( - Any, - Callable, - ClassVar, - Optional, - Protocol, - Union, - final, - get_args, - get_origin, - get_type_hints, -) +from typing import Any, Callable, ClassVar, Optional, Protocol, Union, final, get_args, get_origin, get_type_hints import click from typing_extensions import dataclass_transform diff --git a/chia/seeder/start_crawler.py b/chia/seeder/start_crawler.py index 158d1b4d86f6..66ebc9ed4be2 100644 --- a/chia/seeder/start_crawler.py +++ b/chia/seeder/start_crawler.py @@ -12,10 +12,10 @@ from chia.rpc.crawler_rpc_api import CrawlerRpcApi from chia.seeder.crawler import Crawler from chia.seeder.crawler_api import CrawlerAPI +from chia.server.aliases import CrawlerService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run -from chia.types.aliases import CrawlerService from chia.util.chia_logging import initialize_service_logging from chia.util.config import load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/types/aliases.py b/chia/server/aliases.py similarity index 100% rename from chia/types/aliases.py rename to chia/server/aliases.py diff --git a/chia/server/start_data_layer.py b/chia/server/start_data_layer.py index 4ea67b66107c..3089cb086ab3 100644 --- a/chia/server/start_data_layer.py +++ b/chia/server/start_data_layer.py @@ -13,11 +13,11 @@ from chia.data_layer.util.plugin import load_plugin_configurations from chia.rpc.data_layer_rpc_api import DataLayerRpcApi from chia.rpc.wallet_rpc_client import WalletRpcClient +from chia.server.aliases import DataLayerService, WalletService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run from chia.ssl.create_ssl import create_all_ssl -from chia.types.aliases import DataLayerService, WalletService from chia.util.chia_logging import initialize_logging from chia.util.config import load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/server/start_farmer.py b/chia/server/start_farmer.py index 056ef3e1d6c8..680b7278b06b 100644 --- a/chia/server/start_farmer.py +++ b/chia/server/start_farmer.py @@ -11,10 +11,10 @@ from chia.farmer.farmer import Farmer from chia.farmer.farmer_api import FarmerAPI from chia.rpc.farmer_rpc_api import FarmerRpcApi +from chia.server.aliases import FarmerService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run -from chia.types.aliases import FarmerService from chia.util.chia_logging import initialize_service_logging from chia.util.config import get_unresolved_peer_infos, load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/server/start_full_node.py b/chia/server/start_full_node.py index c628f2a8b094..514942ef908b 100644 --- a/chia/server/start_full_node.py +++ b/chia/server/start_full_node.py @@ -12,10 +12,10 @@ from chia.full_node.full_node import FullNode from chia.full_node.full_node_api import FullNodeAPI from chia.rpc.full_node_rpc_api import FullNodeRpcApi +from chia.server.aliases import FullNodeService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run -from chia.types.aliases import FullNodeService from chia.util.chia_logging import initialize_service_logging from chia.util.config import get_unresolved_peer_infos, load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/server/start_harvester.py b/chia/server/start_harvester.py index 19559f5985b7..58c6f2cda2d1 100644 --- a/chia/server/start_harvester.py +++ b/chia/server/start_harvester.py @@ -11,10 +11,10 @@ from chia.harvester.harvester import Harvester from chia.harvester.harvester_api import HarvesterAPI from chia.rpc.harvester_rpc_api import HarvesterRpcApi +from chia.server.aliases import HarvesterService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run -from chia.types.aliases import HarvesterService from chia.types.peer_info import UnresolvedPeerInfo from chia.util.chia_logging import initialize_service_logging from chia.util.config import get_unresolved_peer_infos, load_config, load_config_cli diff --git a/chia/server/start_introducer.py b/chia/server/start_introducer.py index e8208875e70f..a94e2b923e36 100644 --- a/chia/server/start_introducer.py +++ b/chia/server/start_introducer.py @@ -8,10 +8,10 @@ from chia.apis import ApiProtocolRegistry from chia.introducer.introducer import Introducer from chia.introducer.introducer_api import IntroducerAPI +from chia.server.aliases import IntroducerService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import Service, async_run -from chia.types.aliases import IntroducerService from chia.util.chia_logging import initialize_service_logging from chia.util.config import load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/server/start_timelord.py b/chia/server/start_timelord.py index 357b1c2a4fca..aeff209c0681 100644 --- a/chia/server/start_timelord.py +++ b/chia/server/start_timelord.py @@ -9,12 +9,12 @@ from chia.consensus.constants import ConsensusConstants, replace_str_to_bytes from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.rpc.timelord_rpc_api import TimelordRpcApi +from chia.server.aliases import TimelordService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run from chia.timelord.timelord import Timelord from chia.timelord.timelord_api import TimelordAPI -from chia.types.aliases import TimelordService from chia.util.chia_logging import initialize_service_logging from chia.util.config import get_unresolved_peer_infos, load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/server/start_wallet.py b/chia/server/start_wallet.py index 885b8c1b04e3..df305947b7b7 100644 --- a/chia/server/start_wallet.py +++ b/chia/server/start_wallet.py @@ -10,10 +10,10 @@ from chia.consensus.constants import ConsensusConstants, replace_str_to_bytes from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.rpc.wallet_rpc_api import WalletRpcApi +from chia.server.aliases import WalletService from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_service import RpcInfo, Service, async_run -from chia.types.aliases import WalletService from chia.util.chia_logging import initialize_service_logging from chia.util.config import get_unresolved_peer_infos, load_config, load_config_cli from chia.util.default_root import resolve_root_path diff --git a/chia/simulator/setup_services.py b/chia/simulator/setup_services.py index 3fa87bc7b08a..1304a93e4fc0 100644 --- a/chia/simulator/setup_services.py +++ b/chia/simulator/setup_services.py @@ -17,6 +17,15 @@ from chia.protocols.shared_protocol import Capability, default_capabilities from chia.seeder.dns_server import DNSServer, create_dns_server_service from chia.seeder.start_crawler import create_full_node_crawler_service +from chia.server.aliases import ( + CrawlerService, + FarmerService, + FullNodeService, + HarvesterService, + IntroducerService, + TimelordService, + WalletService, +) from chia.server.outbound_message import NodeType from chia.server.signal_handlers import SignalHandlers from chia.server.start_farmer import create_farmer_service @@ -31,15 +40,6 @@ from chia.simulator.start_simulator import SimulatorFullNodeService, create_full_node_simulator_service from chia.ssl.create_ssl import create_all_ssl from chia.timelord.timelord_launcher import VDFClientProcessMgr, find_vdf_client, spawn_process -from chia.types.aliases import ( - CrawlerService, - FarmerService, - FullNodeService, - HarvesterService, - IntroducerService, - TimelordService, - WalletService, -) from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import UnresolvedPeerInfo from chia.util.bech32m import encode_puzzle_hash diff --git a/chia/types/coin_record.py b/chia/types/coin_record.py index 69a6d6493224..fb1ae5d26d14 100644 --- a/chia/types/coin_record.py +++ b/chia/types/coin_record.py @@ -3,7 +3,8 @@ from dataclasses import dataclass from typing import Optional -from chia.protocols.wallet_protocol import CoinState +from chia_rs import CoinState + from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.ints import uint32, uint64