Remove a dep on chia.harvester from chia.server

Author: richardkiss

build_scripts/pyinstaller.spec

@@ -173,9 +173,26 @@ COLLECT_ARGS = []
 add_binary("chia", f"{ROOT}/chia/cmds/chia.py", COLLECT_ARGS)
 add_binary("daemon", f"{ROOT}/chia/daemon/server.py", COLLECT_ARGS)
 
-for server in SERVERS:
+SERVERS_IN_SERVER = [
+    "data_layer",
+    "wallet",
+    "full_node",
+    "farmer",
+    "introducer",
+    "timelord",
+]
+
+for server in SERVERS_IN_SERVER:
     add_binary(f"start_{server}", f"{ROOT}/chia/server/start_{server}.py", COLLECT_ARGS)
 
+
+SERVERS = [
+    "harvester",
+]
+
+for server in SERVERS:
+    add_binary(f"start_{server}", f"{ROOT}/chia/{server}/start_{server}.py", COLLECT_ARGS)
+
 add_binary("start_crawler", f"{ROOT}/chia/seeder/start_crawler.py", COLLECT_ARGS)
 add_binary("start_seeder", f"{ROOT}/chia/seeder/dns_server.py", COLLECT_ARGS)
 add_binary("start_data_layer_http", f"{ROOT}/chia/data_layer/data_layer_server.py", COLLECT_ARGS)

chia/_tests/cmds/test_farm_cmd.py

@@ -9,7 +9,8 @@
 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.harvester.harvester_service import HarvesterService
+from chia.server.aliases import FarmerService, WalletService
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.start_simulator import SimulatorFullNodeService
 

chia/_tests/conftest.py

@@ -52,12 +52,12 @@
 from chia.farmer.farmer_rpc_client import FarmerRpcClient
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.harvester.harvester_rpc_client import HarvesterRpcClient
+from chia.harvester.harvester_service import HarvesterService
 from chia.seeder.dns_server import DNSServer
 from chia.server.aliases import (
     CrawlerService,
     FarmerService,
     FullNodeService,
-    HarvesterService,
     TimelordService,
     WalletService,
 )

chia/_tests/core/services/test_services.py

@@ -89,7 +89,7 @@ async def test_daemon_terminates(signal_number: signal.Signals, chia_root: ChiaR
         [DataLayerRpcClient.create_as_context, "chia.server.start_data_layer", "data_layer"],
         [FarmerRpcClient.create_as_context, "chia.server.start_farmer", "farmer"],
         [FullNodeRpcClient.create_as_context, "chia.server.start_full_node", "full_node"],
-        [HarvesterRpcClient.create_as_context, "chia.server.start_harvester", "harvester"],
+        [HarvesterRpcClient.create_as_context, "chia.harvester.start_harvester", "harvester"],
         [WalletRpcClient.create_as_context, "chia.server.start_wallet", "wallet"],
         [None, "chia.server.start_introducer", "introducer"],
         # TODO: fails...  make it not do that

chia/_tests/farmer_harvester/test_farmer.py

@@ -21,11 +21,12 @@
 from chia._tests.util.misc import DataCase, Marks, datacases
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.farmer.farmer import UPDATE_POOL_FARMER_INFO_INTERVAL, Farmer, increment_pool_stats, strip_old_entries
+from chia.harvester.harvester_service import HarvesterService
 from chia.pools.pool_config import PoolWalletConfig
 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.aliases import FarmerService
 from chia.server.ws_connection import WSChiaConnection
 from chia.simulator.block_tools import BlockTools
 from chia.types.blockchain_format.proof_of_space import (

chia/_tests/farmer_harvester/test_farmer_harvester.py

@@ -16,11 +16,12 @@
 from chia.cmds.cmds_util import get_any_service_client
 from chia.farmer.farmer import Farmer
 from chia.harvester.harvester_rpc_client import HarvesterRpcClient
+from chia.harvester.harvester_service import HarvesterService
 from chia.plotting.util import PlotsRefreshParameter
 from chia.protocols import farmer_protocol, harvester_protocol
 from chia.protocols.outbound_message import NodeType, make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.aliases import FarmerService, HarvesterService
+from chia.server.aliases import FarmerService
 from chia.simulator.block_tools import BlockTools
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.config import load_config

chia/_tests/farmer_harvester/test_filter_prefix_bits.py

@@ -16,8 +16,8 @@
 from chia.farmer.farmer_api import FarmerAPI
 from chia.farmer.farmer_rpc_client import FarmerRpcClient
 from chia.harvester.harvester_rpc_client import HarvesterRpcClient
+from chia.harvester.harvester_service import HarvesterService
 from chia.protocols import farmer_protocol
-from chia.server.aliases import HarvesterService
 from chia.simulator.block_tools import create_block_tools_async, test_constants
 from chia.types.blockchain_format.proof_of_space import get_plot_id, passes_plot_filter
 from chia.util.keychain import Keychain

chia/_tests/farmer_harvester/test_third_party_harvesters.py

@@ -35,11 +35,12 @@
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.harvester.harvester import Harvester
 from chia.harvester.harvester_api import HarvesterAPI
+from chia.harvester.harvester_service import HarvesterService
 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.outbound_message import Message, NodeType, make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.aliases import FarmerService, FullNodeService, HarvesterService
+from chia.server.aliases import FarmerService, FullNodeService
 from chia.server.server import ChiaServer
 from chia.server.ws_connection import WSChiaConnection
 from chia.simulator.block_tools import BlockTools

chia/_tests/plot_sync/test_plot_sync.py

@@ -21,6 +21,7 @@
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.farmer.farmer import Farmer
 from chia.harvester.harvester import Harvester
+from chia.harvester.harvester_service import HarvesterService
 from chia.plot_sync.delta import Delta, PathListDelta, PlotListDelta
 from chia.plot_sync.receiver import Receiver
 from chia.plot_sync.sender import Sender
@@ -29,7 +30,7 @@
 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.server.aliases import FarmerService
 from chia.simulator.block_tools import BlockTools
 from chia.util.config import create_default_chia_config, lock_and_load_config, save_config
 from chia.util.streamable import _T_Streamable

chia/_tests/plot_sync/test_sync_simulated.py

@@ -21,6 +21,7 @@
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.farmer.farmer import Farmer
 from chia.harvester.harvester import Harvester
+from chia.harvester.harvester_service import HarvesterService
 from chia.plot_sync.receiver import Receiver
 from chia.plot_sync.sender import Sender
 from chia.plot_sync.util import Constants
@@ -29,7 +30,7 @@
 from chia.protocols.harvester_protocol import PlotSyncError, PlotSyncResponse
 from chia.protocols.outbound_message import make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.aliases import FarmerService, HarvesterService
+from chia.server.aliases import FarmerService
 from chia.server.ws_connection import WSChiaConnection
 from chia.simulator.block_tools import BlockTools
 from chia.util.batches import to_batches