chia.data_layer

Author: richardkiss

build_scripts/pyinstaller.spec

@@ -25,15 +25,6 @@ version_data = [
 
 block_cipher = None
 
-SERVERS = [
-    "data_layer",
-    "wallet",
-    "full_node",
-    "harvester",
-    "farmer",
-    "introducer",
-    "timelord",
-]
 
 if THIS_IS_WINDOWS:
     hidden_imports_for_windows = ["win32timezone", "win32cred", "pywintypes", "win32ctypes.pywin32"]
@@ -174,8 +165,8 @@ add_binary("chia", f"{ROOT}/chia/cmds/chia.py", COLLECT_ARGS)
 add_binary("daemon", f"{ROOT}/chia/daemon/server.py", COLLECT_ARGS)
 
 
+
 SERVERS_IN_SERVER = [
-    "data_layer",
     "wallet",
     "full_node",
     "introducer",
@@ -184,8 +175,8 @@ SERVERS_IN_SERVER = [
 for server in SERVERS_IN_SERVER:
     add_binary(f"start_{server}", f"{ROOT}/chia/server/start_{server}.py", COLLECT_ARGS)
 
-
 SERVERS = [
+    "data_layer",
     "harvester",
     "farmer",
     "timelord",

chia/_tests/core/data_layer/test_data_rpc.py

@@ -44,6 +44,7 @@
 from chia.data_layer.data_layer_errors import KeyNotFoundError, OfferIntegrityError
 from chia.data_layer.data_layer_rpc_api import DataLayerRpcApi
 from chia.data_layer.data_layer_rpc_client import DataLayerRpcClient
+from chia.data_layer.data_layer_service import DataLayerService
 from chia.data_layer.data_layer_util import (
     HashOnlyProof,
     OfferStore,
@@ -56,8 +57,8 @@
 from chia.data_layer.data_layer_wallet import DataLayerWallet, verify_offer
 from chia.data_layer.data_store import DataStore
 from chia.data_layer.download_data import get_delta_filename_path, get_full_tree_filename_path
-from chia.server.aliases import DataLayerService, WalletService
-from chia.server.start_data_layer import create_data_layer_service
+from chia.data_layer.start_data_layer import create_data_layer_service
+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

chia/_tests/core/services/test_services.py

@@ -86,7 +86,7 @@ async def test_daemon_terminates(signal_number: signal.Signals, chia_root: ChiaR
 @pytest.mark.parametrize(
     argnames=["create_service", "module_path", "service_config_name"],
     argvalues=[
-        [DataLayerRpcClient.create_as_context, "chia.server.start_data_layer", "data_layer"],
+        [DataLayerRpcClient.create_as_context, "chia.data_layer.start_data_layer", "data_layer"],
         [FarmerRpcClient.create_as_context, "chia.farmer.start_farmer", "farmer"],
         [FullNodeRpcClient.create_as_context, "chia.server.start_full_node", "full_node"],
         [HarvesterRpcClient.create_as_context, "chia.harvester.start_harvester", "harvester"],

chia/data_layer/data_layer_service.py

@@ -0,0 +1,8 @@
+from __future__ import annotations
+
+from chia.data_layer.data_layer import DataLayer
+from chia.data_layer.data_layer_api import DataLayerAPI
+from chia.data_layer.data_layer_rpc_api import DataLayerRpcApi
+from chia.server.start_service import Service
+
+DataLayerService = Service[DataLayer, DataLayerAPI, DataLayerRpcApi]

chia/server/start_data_layer.py chia/data_layer/start_data_layer.pychia/server/start_data_layer.py renamed to chia/data_layer/start_data_layer.py

@@ -12,10 +12,11 @@
 from chia.data_layer.data_layer import DataLayer
 from chia.data_layer.data_layer_api import DataLayerAPI
 from chia.data_layer.data_layer_rpc_api import DataLayerRpcApi
+from chia.data_layer.data_layer_service import DataLayerService
 from chia.data_layer.data_layer_util import PluginRemote
 from chia.data_layer.util.plugin import load_plugin_configurations
 from chia.protocols.outbound_message import NodeType
-from chia.server.aliases import DataLayerService, WalletService
+from chia.server.aliases import WalletService
 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
@@ -143,7 +144,7 @@ def main() -> int:
     root_path = resolve_root_path(override=None)
 
     with maybe_manage_task_instrumentation(
-        enable=os.environ.get(f"CHIA_INSTRUMENT_{SERVICE_NAME.upper()}") is not None
+        enable=os.environ.get(f"CHIA_INSTRUMENT_{SERVICE_NAME.upper()}") is not None,
     ):
         return async_run(coro=async_main(root_path=root_path))
 

chia/server/aliases.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-from chia.data_layer.data_layer import DataLayer
-from chia.data_layer.data_layer_api import DataLayerAPI
-from chia.data_layer.data_layer_rpc_api import DataLayerRpcApi
 from chia.full_node.full_node import FullNode
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.full_node.full_node_rpc_api import FullNodeRpcApi
@@ -17,7 +14,6 @@
 from chia.wallet.wallet_rpc_api import WalletRpcApi
 
 CrawlerService = Service[Crawler, CrawlerAPI, CrawlerRpcApi]
-DataLayerService = Service[DataLayer, DataLayerAPI, DataLayerRpcApi]
 FullNodeService = Service[FullNode, FullNodeAPI, FullNodeRpcApi]
 IntroducerService = Service[Introducer, IntroducerAPI, FullNodeRpcApi]
 WalletService = Service[WalletNode, WalletNodeAPI, WalletRpcApi]

pyproject.toml

@@ -29,7 +29,7 @@ chia_seeder = "chia.seeder.dns_server:main"
 chia_timelord = "chia.timelord.start_timelord:main"
 chia_timelord_launcher = "chia.timelord.timelord_launcher:main"
 chia_full_node_simulator = "chia.simulator.start_simulator:main"
-chia_data_layer = "chia.server.start_data_layer:main"
+chia_data_layer = "chia.data_layer.start_data_layer:main"
 chia_data_layer_http = "chia.data_layer.data_layer_server:main"
 chia_data_layer_s3_plugin = "chia.data_layer.s3_plugin_service:run_server"
 

tach.toml

@@ -35,7 +35,7 @@ depends_on = [
     # and/or the `start_*.py` scripts, which can go in their respective modules
     { path = "chia.rpc", deprecated = false },
     { path = "chia.full_node", deprecated = false },
-    { path = "chia.data_layer", deprecated = false },
+    { path = "chia.data_layer", deprecated = true },
     { path = "chia.farmer", deprecated = true },
     { path = "chia.simulator", deprecated = false },
     { path = "chia.daemon", deprecated = false },
@@ -84,6 +84,8 @@ depends_on = [
 [[modules]]
 path = "chia.data_layer"
 depends_on = [
+    "chia.apis",
+    "chia.ssl",
     "chia.types",
     "chia.util",
     "chia.protocols",