chia.timelord

Author: richardkiss

chia/_tests/conftest.py

@@ -58,7 +58,6 @@
 from chia.server.aliases import (
     CrawlerService,
     FullNodeService,
-    TimelordService,
     WalletService,
 )
 from chia.server.server import ChiaServer
@@ -74,6 +73,7 @@
 )
 from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.simulator.wallet_tools import WalletTool
+from chia.timelord.timelord_service import TimelordService
 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

chia/_tests/core/services/test_services.py

@@ -94,7 +94,7 @@ async def test_daemon_terminates(signal_number: signal.Signals, chia_root: ChiaR
         [None, "chia.server.start_introducer", "introducer"],
         # TODO: fails...  make it not do that
         # [None, "chia.seeder.start_crawler", "crawler"],
-        [None, "chia.server.start_timelord", "timelord"],
+        [None, "chia.timelord.start_timelord", "timelord"],
         pytest.param(
             None,
             "chia.timelord.timelord_launcher",

chia/_tests/util/setup_nodes.py

@@ -24,7 +24,7 @@
 from chia.harvester.harvester_service import HarvesterService
 from chia.introducer.introducer_api import IntroducerAPI
 from chia.protocols.shared_protocol import Capability
-from chia.server.aliases import FullNodeService, TimelordService, WalletService
+from chia.server.aliases import FullNodeService, 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
@@ -42,6 +42,7 @@
 )
 from chia.simulator.socket import find_available_listen_port
 from chia.simulator.start_simulator import SimulatorFullNodeService
+from chia.timelord.timelord_service import TimelordService
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.hash import std_hash
 from chia.util.keychain import Keychain

chia/server/aliases.py

@@ -12,9 +12,6 @@
 from chia.seeder.crawler_api import CrawlerAPI
 from chia.seeder.crawler_rpc_api import CrawlerRpcApi
 from chia.server.start_service import Service
-from chia.timelord.timelord import Timelord
-from chia.timelord.timelord_api import TimelordAPI
-from chia.timelord.timelord_rpc_api import TimelordRpcApi
 from chia.wallet.wallet_node import WalletNode
 from chia.wallet.wallet_node_api import WalletNodeAPI
 from chia.wallet.wallet_rpc_api import WalletRpcApi
@@ -23,5 +20,4 @@
 DataLayerService = Service[DataLayer, DataLayerAPI, DataLayerRpcApi]
 FullNodeService = Service[FullNode, FullNodeAPI, FullNodeRpcApi]
 IntroducerService = Service[Introducer, IntroducerAPI, FullNodeRpcApi]
-TimelordService = Service[Timelord, TimelordAPI, TimelordRpcApi]
 WalletService = Service[WalletNode, WalletNodeAPI, WalletRpcApi]

chia/simulator/setup_services.py

@@ -30,21 +30,21 @@
     CrawlerService,
     FullNodeService,
     IntroducerService,
-    TimelordService,
     WalletService,
 )
 from chia.server.resolve_peer_info import set_peer_info
 from chia.server.signal_handlers import SignalHandlers
 from chia.server.start_full_node import create_full_node_service
 from chia.server.start_introducer import create_introducer_service
-from chia.server.start_timelord import create_timelord_service
 from chia.server.start_wallet import create_wallet_service
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.keyring import TempKeyring
 from chia.simulator.ssl_certs import get_next_nodes_certs_and_keys, get_next_private_ca_cert_and_key
 from chia.simulator.start_simulator import SimulatorFullNodeService, create_full_node_simulator_service
 from chia.ssl.create_ssl import create_all_ssl
+from chia.timelord.start_timelord import create_timelord_service
 from chia.timelord.timelord_launcher import VDFClientProcessMgr, find_vdf_client, spawn_process
+from chia.timelord.timelord_service import TimelordService
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import config_path_for_filename, load_config, lock_and_load_config, save_config

chia/server/start_timelord.py renamed to chia/timelord/start_timelord.py

@@ -11,21 +11,18 @@
 from chia.consensus.constants import replace_str_to_bytes
 from chia.consensus.default_constants import DEFAULT_CONSTANTS, update_testnet_overrides
 from chia.protocols.outbound_message import NodeType
-from chia.server.aliases import TimelordService
 from chia.server.resolve_peer_info import get_unresolved_peer_infos
 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.timelord.timelord_rpc_api import TimelordRpcApi
+from chia.timelord.timelord_service import TimelordService
 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
 from chia.util.task_timing import maybe_manage_task_instrumentation
 
-# See: https://bugs.python.org/issue29288
-"".encode("idna")
-
 SERVICE_NAME = "timelord"
 
 
@@ -36,7 +33,6 @@ def create_timelord_service(
     connect_to_daemon: bool = True,
 ) -> TimelordService:
     service_config = config[SERVICE_NAME]
-
     network_id = service_config["selected_network"]
     overrides = service_config["network_overrides"]["constants"][network_id]
     update_testnet_overrides(network_id, overrides)

chia/timelord/timelord_service.py

@@ -0,0 +1,8 @@
+from __future__ import annotations
+
+from chia.server.start_service import Service
+from chia.timelord.timelord import Timelord
+from chia.timelord.timelord_api import TimelordAPI
+from chia.timelord.timelord_rpc_api import TimelordRpcApi
+
+TimelordService = Service[Timelord, TimelordAPI, TimelordRpcApi]

pyproject.toml

@@ -26,7 +26,7 @@ chia_farmer = "chia.farmer.start_farmer:main"
 chia_introducer = "chia.server.start_introducer:main"
 chia_crawler = "chia.seeder.start_crawler:main"
 chia_seeder = "chia.seeder.dns_server:main"
-chia_timelord = "chia.server.start_timelord: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"

tach.toml

@@ -40,7 +40,7 @@ depends_on = [
     { path = "chia.simulator", deprecated = false },
     { path = "chia.daemon", deprecated = false },
     { path = "chia.harvester", deprecated = true },
-    { path = "chia.timelord", deprecated = false },
+    { path = "chia.timelord", deprecated = true },
     { path = "chia.introducer", deprecated = false },
     { path = "chia.consensus", deprecated = false },
     { path = "chia.wallet", deprecated = false },
@@ -158,6 +158,7 @@ depends_on = ["chia.util"]
 [[modules]]
 path = "chia.timelord"
 depends_on = [
+    "chia.apis",
     "chia.types",
     "chia.util",
     { path = "chia.server", deprecated = false },