add Service type variables for each combination (#16970)

Author: altendky

chia/seeder/start_crawler.py

@@ -13,6 +13,7 @@
 from chia.seeder.crawler_api import CrawlerAPI
 from chia.server.outbound_message import NodeType
 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 DEFAULT_ROOT_PATH
@@ -30,7 +31,7 @@ def create_full_node_crawler_service(
     config: Dict[str, Any],
     consensus_constants: ConsensusConstants,
     connect_to_daemon: bool = True,
-) -> Service[Crawler, CrawlerAPI]:
+) -> CrawlerService:
     service_config = config[SERVICE_NAME]
     crawler_config = service_config["crawler"]
 

chia/server/start_data_layer.py

@@ -13,13 +13,12 @@
 from chia.server.outbound_message import NodeType
 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 DEFAULT_ROOT_PATH
 from chia.util.ints import uint16
 from chia.util.misc import SignalHandlers
-from chia.wallet.wallet_node import WalletNode
-from chia.wallet.wallet_node_api import WalletNodeAPI
 
 # See: https://bugs.python.org/issue29288
 "".encode("idna")
@@ -34,9 +33,9 @@ def create_data_layer_service(
     config: Dict[str, Any],
     downloaders: List[PluginRemote],
     uploaders: List[PluginRemote],  # dont add FilesystemUploader to this, it is the default uploader
-    wallet_service: Optional[Service[WalletNode, WalletNodeAPI]] = None,
+    wallet_service: Optional[WalletService] = None,
     connect_to_daemon: bool = True,
-) -> Service[DataLayer, DataLayerAPI]:
+) -> DataLayerService:
     if uploaders is None:
         uploaders = []
     if downloaders is None:

chia/server/start_farmer.py

@@ -11,6 +11,7 @@
 from chia.rpc.farmer_rpc_api import FarmerRpcApi
 from chia.server.outbound_message import NodeType
 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 DEFAULT_ROOT_PATH
@@ -30,7 +31,7 @@ def create_farmer_service(
     consensus_constants: ConsensusConstants,
     keychain: Optional[Keychain] = None,
     connect_to_daemon: bool = True,
-) -> Service[Farmer, FarmerAPI]:
+) -> FarmerService:
     service_config = config[SERVICE_NAME]
 
     network_id = service_config["selected_network"]

chia/server/start_full_node.py

@@ -14,6 +14,7 @@
 from chia.rpc.full_node_rpc_api import FullNodeRpcApi
 from chia.server.outbound_message import NodeType
 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 load_config, load_config_cli
 from chia.util.default_root import DEFAULT_ROOT_PATH
@@ -34,7 +35,7 @@ async def create_full_node_service(
     consensus_constants: ConsensusConstants,
     connect_to_daemon: bool = True,
     override_capabilities: Optional[List[Tuple[uint16, str]]] = None,
-) -> Service[FullNode, FullNodeAPI]:
+) -> FullNodeService:
     service_config = config[SERVICE_NAME]
 
     full_node = await FullNode.create(

chia/server/start_harvester.py

@@ -11,6 +11,7 @@
 from chia.rpc.harvester_rpc_api import HarvesterRpcApi
 from chia.server.outbound_message import NodeType
 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
@@ -29,7 +30,7 @@ def create_harvester_service(
     consensus_constants: ConsensusConstants,
     farmer_peers: Set[UnresolvedPeerInfo],
     connect_to_daemon: bool = True,
-) -> Service[Harvester, HarvesterAPI]:
+) -> HarvesterService:
     service_config = config[SERVICE_NAME]
 
     overrides = service_config["network_overrides"]["constants"][service_config["selected_network"]]

chia/server/start_introducer.py

@@ -8,6 +8,7 @@
 from chia.introducer.introducer_api import IntroducerAPI
 from chia.server.outbound_message import NodeType
 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 DEFAULT_ROOT_PATH
@@ -24,7 +25,7 @@ def create_introducer_service(
     config: Dict[str, Any],
     advertised_port: Optional[int] = None,
     connect_to_daemon: bool = True,
-) -> Service[Introducer, IntroducerAPI]:
+) -> IntroducerService:
     service_config = config[SERVICE_NAME]
 
     if advertised_port is None:

chia/server/start_timelord.py

@@ -12,6 +12,7 @@
 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 DEFAULT_ROOT_PATH
@@ -31,7 +32,7 @@ def create_timelord_service(
     config: Dict[str, Any],
     constants: ConsensusConstants,
     connect_to_daemon: bool = True,
-) -> Service[Timelord, TimelordAPI]:
+) -> TimelordService:
     service_config = config[SERVICE_NAME]
     overrides = service_config["network_overrides"]["constants"][service_config["selected_network"]]
     updated_constants = constants.replace_str_to_bytes(**overrides)

chia/server/start_wallet.py

@@ -11,6 +11,7 @@
 from chia.rpc.wallet_rpc_api import WalletRpcApi
 from chia.server.outbound_message import NodeType
 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 DEFAULT_ROOT_PATH
@@ -33,7 +34,7 @@ def create_wallet_service(
     consensus_constants: ConsensusConstants,
     keychain: Optional[Keychain] = None,
     connect_to_daemon: bool = True,
-) -> Service[WalletNode, WalletNodeAPI]:
+) -> WalletService:
     service_config = config[SERVICE_NAME]
 
     overrides = service_config["network_overrides"]["constants"][service_config["selected_network"]]

chia/simulator/setup_services.py

@@ -14,36 +14,32 @@
 from chia.cmds.init_funcs import init
 from chia.consensus.constants import ConsensusConstants
 from chia.daemon.server import WebSocketServer, daemon_launch_lock_path
-from chia.farmer.farmer import Farmer
-from chia.farmer.farmer_api import FarmerAPI
-from chia.full_node.full_node import FullNode
-from chia.full_node.full_node_api import FullNodeAPI
-from chia.harvester.harvester import Harvester
-from chia.harvester.harvester_api import HarvesterAPI
-from chia.introducer.introducer import Introducer
-from chia.introducer.introducer_api import IntroducerAPI
 from chia.protocols.shared_protocol import Capability, capabilities
-from chia.seeder.crawler import Crawler
-from chia.seeder.crawler_api import CrawlerAPI
 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.outbound_message import NodeType
 from chia.server.start_farmer import create_farmer_service
 from chia.server.start_full_node import create_full_node_service
 from chia.server.start_harvester import create_harvester_service
 from chia.server.start_introducer import create_introducer_service
-from chia.server.start_service import 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.full_node_simulator import FullNodeSimulator
 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 create_full_node_simulator_service
 from chia.ssl.create_ssl import create_all_ssl
-from chia.timelord.timelord import Timelord
-from chia.timelord.timelord_api import TimelordAPI
 from chia.timelord.timelord_launcher import VDFClientProcessMgr, find_vdf_client, spawn_process
+from chia.types.aliases import (
+    CrawlerService,
+    FarmerService,
+    FullNodeService,
+    HarvesterService,
+    IntroducerService,
+    SimulatorFullNodeService,
+    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
@@ -53,8 +49,6 @@
 from chia.util.keychain import bytes_to_mnemonic
 from chia.util.lock import Lockfile
 from chia.util.misc import SignalHandlers
-from chia.wallet.wallet_node import WalletNode
-from chia.wallet.wallet_node_api import WalletNodeAPI
 
 log = logging.getLogger(__name__)
 
@@ -120,7 +114,7 @@ async def setup_full_node(
     disable_capabilities: Optional[List[Capability]] = None,
     *,
     reuse_db: bool = False,
-) -> AsyncGenerator[Union[Service[FullNode, FullNodeAPI], Service[FullNode, FullNodeSimulator]], None]:
+) -> AsyncGenerator[Union[FullNodeService, SimulatorFullNodeService], None]:
     if reuse_db:
         db_path: Union[str, Path] = local_bt.root_path / f"{db_name}"
         uri = False
@@ -158,7 +152,7 @@ async def setup_full_node(
     updated_constants = consensus_constants.replace_str_to_bytes(**overrides)
     local_bt.change_config(config)
     override_capabilities = None if disable_capabilities is None else get_capabilities(disable_capabilities)
-    service: Union[Service[FullNode, FullNodeAPI], Service[FullNode, FullNodeSimulator]]
+    service: Union[FullNodeService, SimulatorFullNodeService]
     if simulator:
         service = await create_full_node_simulator_service(
             local_bt.root_path,
@@ -183,7 +177,7 @@ async def setup_full_node(
 @asynccontextmanager
 async def setup_crawler(
     root_path_populated_with_config: Path, database_uri: str
-) -> AsyncGenerator[Service[Crawler, CrawlerAPI], None]:
+) -> AsyncGenerator[CrawlerService, None]:
     create_all_ssl(
         root_path=root_path_populated_with_config,
         private_ca_crt_and_key=get_next_private_ca_cert_and_key().collateral.cert_and_key,
@@ -246,7 +240,7 @@ async def setup_wallet_node(
     introducer_port: Optional[uint16] = None,
     key_seed: Optional[bytes] = None,
     initial_num_public_keys: int = 5,
-) -> AsyncGenerator[Service[WalletNode, WalletNodeAPI], None]:
+) -> AsyncGenerator[WalletService, None]:
     with TempKeyring(populate=True) as keychain:
         config = local_bt.config
         service_config = config["wallet"]
@@ -336,7 +330,7 @@ async def setup_harvester(
     farmer_peer: Optional[UnresolvedPeerInfo],
     consensus_constants: ConsensusConstants,
     start_service: bool = True,
-) -> AsyncGenerator[Service[Harvester, HarvesterAPI], None]:
+) -> AsyncGenerator[HarvesterService, None]:
     with create_lock_and_load_config(b_tools.root_path / "config" / "ssl" / "ca", root_path) as config:
         config["logging"]["log_stdout"] = True
         config["selected_network"] = "testnet0"
@@ -368,7 +362,7 @@ async def setup_farmer(
     full_node_port: Optional[uint16] = None,
     start_service: bool = True,
     port: uint16 = uint16(0),
-) -> AsyncGenerator[Service[Farmer, FarmerAPI], None]:
+) -> AsyncGenerator[FarmerService, None]:
     with create_lock_and_load_config(b_tools.root_path / "config" / "ssl" / "ca", root_path) as root_config:
         root_config["logging"]["log_stdout"] = True
         root_config["selected_network"] = "testnet0"
@@ -409,7 +403,7 @@ async def setup_farmer(
 
 
 @asynccontextmanager
-async def setup_introducer(bt: BlockTools, port: int) -> AsyncGenerator[Service[Introducer, IntroducerAPI], None]:
+async def setup_introducer(bt: BlockTools, port: int) -> AsyncGenerator[IntroducerService, None]:
     service = create_introducer_service(
         bt.root_path,
         bt.config,
@@ -497,7 +491,7 @@ async def setup_timelord(
     config: Dict[str, Any],
     root_path: Path,
     vdf_port: uint16 = uint16(0),
-) -> AsyncGenerator[Service[Timelord, TimelordAPI], None]:
+) -> AsyncGenerator[TimelordService, None]:
     service_config = config["timelord"]
     set_peer_info(service_config, peer_type=NodeType.FULL_NODE, peer_port=full_node_port)
     service_config["bluebox_mode"] = sanitizer

chia/simulator/start_simulator.py

@@ -13,6 +13,7 @@
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_full_node_rpc_api import SimulatorFullNodeRpcApi
+from chia.types.aliases import SimulatorFullNodeService
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import decode_puzzle_hash
 from chia.util.chia_logging import initialize_logging
@@ -36,7 +37,7 @@ async def create_full_node_simulator_service(
     bt: BlockTools,
     connect_to_daemon: bool = True,
     override_capabilities: Optional[List[Tuple[uint16, str]]] = None,
-) -> Service[FullNode, FullNodeSimulator]:
+) -> SimulatorFullNodeService:
     service_config = config[SERVICE_NAME]
     constants = bt.constants
 
@@ -66,7 +67,7 @@ async def create_full_node_simulator_service(
 
 @dataclass
 class StartedSimulator:
-    service: Service[FullNode, FullNodeSimulator]
+    service: SimulatorFullNodeService
     exit_code: int