Skip to content

Commit 4c1e3a2

Browse files
authored
dont add solver peer (#20234)
* dont add solver peer * pass solver peer in tests
1 parent 5522ab5 commit 4c1e3a2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

chia/farmer/start_farmer.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from chia.server.resolve_peer_info import get_unresolved_peer_infos
1919
from chia.server.signal_handlers import SignalHandlers
2020
from chia.server.start_service import RpcInfo, Service, async_run
21+
from chia.types.peer_info import UnresolvedPeerInfo
2122
from chia.util.chia_logging import initialize_service_logging
2223
from chia.util.config import load_config, load_config_cli
2324
from chia.util.default_root import resolve_root_path
@@ -37,6 +38,7 @@ def create_farmer_service(
3738
consensus_constants: ConsensusConstants,
3839
keychain: Optional[Keychain] = None,
3940
connect_to_daemon: bool = True,
41+
solver_peer: Optional[UnresolvedPeerInfo] = None,
4042
) -> FarmerService:
4143
service_config = config[SERVICE_NAME]
4244

@@ -54,6 +56,10 @@ def create_farmer_service(
5456
if service_config.get("start_rpc_server", True):
5557
rpc_info = (FarmerRpcApi, service_config["rpc_port"])
5658

59+
connect_peers = get_unresolved_peer_infos(service_config, NodeType.FULL_NODE)
60+
if solver_peer is not None:
61+
connect_peers.add(solver_peer)
62+
5763
return Service(
5864
root_path=root_path,
5965
config=config,
@@ -62,8 +68,7 @@ def create_farmer_service(
6268
node_type=NodeType.FARMER,
6369
advertised_port=service_config["port"],
6470
service_name=SERVICE_NAME,
65-
connect_peers=get_unresolved_peer_infos(service_config, NodeType.FULL_NODE)
66-
| get_unresolved_peer_infos(service_config, NodeType.SOLVER),
71+
connect_peers=connect_peers,
6772
on_connect_callback=node.on_connect,
6873
network_id=network_id,
6974
rpc_info=rpc_info,

chia/simulator/setup_services.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ async def setup_farmer(
404404
consensus_constants,
405405
b_tools.local_keychain,
406406
connect_to_daemon=False,
407+
solver_peer=solver_peer,
407408
)
408409

409410
async with service.manage(start=start_service):

0 commit comments

Comments
 (0)