Refactor make_p2pd
Let `make_p2pd` get rid of `unused_tcp_port_factory`, which should only exist in fixtures/tests.
This commit is contained in:
parent
7385a7a677
commit
749ff275ed
|
@ -45,7 +45,10 @@ async def p2pds(num_p2pds, is_host_secure, is_gossipsub, unused_tcp_port_factory
|
||||||
p2pds = await asyncio.gather(
|
p2pds = await asyncio.gather(
|
||||||
*[
|
*[
|
||||||
make_p2pd(
|
make_p2pd(
|
||||||
unused_tcp_port_factory, is_host_secure, is_gossipsub=is_gossipsub
|
unused_tcp_port_factory(),
|
||||||
|
unused_tcp_port_factory(),
|
||||||
|
is_host_secure,
|
||||||
|
is_gossipsub=is_gossipsub,
|
||||||
)
|
)
|
||||||
for _ in range(num_p2pds)
|
for _ in range(num_p2pds)
|
||||||
]
|
]
|
||||||
|
|
|
@ -152,14 +152,15 @@ class Daemon:
|
||||||
|
|
||||||
|
|
||||||
async def make_p2pd(
|
async def make_p2pd(
|
||||||
unused_tcp_port_factory,
|
daemon_control_port: int,
|
||||||
|
client_callback_port: int,
|
||||||
is_secure: bool,
|
is_secure: bool,
|
||||||
is_pubsub_enabled=True,
|
is_pubsub_enabled=True,
|
||||||
is_gossipsub=True,
|
is_gossipsub=True,
|
||||||
is_pubsub_signing=False,
|
is_pubsub_signing=False,
|
||||||
is_pubsub_signing_strict=False,
|
is_pubsub_signing_strict=False,
|
||||||
) -> Daemon:
|
) -> Daemon:
|
||||||
control_maddr = Multiaddr(f"/ip4/{LOCALHOST_IP}/tcp/{unused_tcp_port_factory()}")
|
control_maddr = Multiaddr(f"/ip4/{LOCALHOST_IP}/tcp/{daemon_control_port}")
|
||||||
p2pd_proc = P2PDProcess(
|
p2pd_proc = P2PDProcess(
|
||||||
control_maddr,
|
control_maddr,
|
||||||
is_secure,
|
is_secure,
|
||||||
|
@ -169,9 +170,7 @@ async def make_p2pd(
|
||||||
is_pubsub_signing_strict,
|
is_pubsub_signing_strict,
|
||||||
)
|
)
|
||||||
await p2pd_proc.start()
|
await p2pd_proc.start()
|
||||||
client_callback_maddr = Multiaddr(
|
client_callback_maddr = Multiaddr(f"/ip4/{LOCALHOST_IP}/tcp/{client_callback_port}")
|
||||||
f"/ip4/{LOCALHOST_IP}/tcp/{unused_tcp_port_factory()}"
|
|
||||||
)
|
|
||||||
p2pc = Client(control_maddr, client_callback_maddr)
|
p2pc = Client(control_maddr, client_callback_maddr)
|
||||||
await p2pc.listen()
|
await p2pc.listen()
|
||||||
peer_id, maddrs = await p2pc.identify()
|
peer_id, maddrs = await p2pc.identify()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user