mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2025-12-31 20:36:24 +00:00
* fix pyproject.toml , add ruff * rm lock * make progress * add poetry lock ignore * fix type issues * fix tcp type errors * fix text example - type error - wrong args * add setuptools to dev * test ci * fix docs build * fix type issues for new_swarm & new_host * fix types in gossipsub * fix type issues in noise * wip: factories * revert factories * fix more type issues * more type fixes * fix: add null checks for noise protocol initialization and key handling * corrected argument-errors in peerId and Multiaddr in peer tests * fix: Noice - remove redundant type casts in BaseNoiseMsgReadWriter * fix: update test_notify.py to use SwarmFactory.create_batch_and_listen, fix type hints, and comment out ClosedStream assertions * Fix type checks for pubsub module Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> * Fix type checks for pubsub module-tests Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> * noise: add checks for uninitialized protocol and key states in PatternXX Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * pubsub: add None checks for optional fields in FloodSub and Pubsub Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * Fix type hints and improve testing Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * remove redundant checks Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * fix build issues * add optional to trio service * fix types * fix type errors * Fix type errors Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * fixed more-type checks in crypto and peer_data files * wip: factories * replaced union with optional * fix: type-error in interp-utils and peerinfo * replace pyright with pyrefly * add pyrefly.toml * wip: fix multiselect issues * try typecheck * base check * mcache test fixes , typecheck ci update * fix ci * will this work * minor fix * use poetry * fix wokflow * use cache,fix err * fix pyrefly.toml * fix pyrefly.toml * fix cache in ci * deploy commit * add main baseline * update to v5 * improve typecheck ci (#14) * fix typo * remove holepunching code (#16) * fix gossipsub typeerrors (#17) * fix: ensure initiator user includes remote peer id in handshake (#15) * fix ci (#19) * typefix: custom_types | core/peerinfo/test_peer_info | io/abc | pubsub/floodsub | protocol_muxer/multiselect (#18) * fix: Typefixes in PeerInfo (#21) * fix minor type issue (#22) * fix type errors in pubsub (#24) * fix: Minor typefixes in tests (#23) * Fix failing tests for type-fixed test/pubsub (#8) * move pyrefly & ruff to pyproject.toml & rm .project-template (#28) * move the async_context file to tests/core * move crypto test to crypto folder * fix: some typefixes (#25) * fix type errors * fix type issues * fix: update gRPC API usage in autonat_pb2_grpc.py (#31) * md: typecheck ci * rm comments * clean up : from review suggestions * use | None over Optional as per new python standards * drop supporto for py3.9 * newsfragments --------- Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> Co-authored-by: acul71 <luca.pisani@birdo.net> Co-authored-by: kaneki003 <sakshamchauhan707@gmail.com> Co-authored-by: sukhman <sukhmansinghsaluja@gmail.com> Co-authored-by: varun-r-mallya <varunrmallya@gmail.com> Co-authored-by: varunrmallya <100590632+varun-r-mallya@users.noreply.github.com> Co-authored-by: lla-dane <abhinavagarwalla6@gmail.com> Co-authored-by: Collins <ArtemisfowlX@protonmail.com> Co-authored-by: Abhinav Agarwalla <120122716+lla-dane@users.noreply.github.com> Co-authored-by: guha-rahul <52607971+guha-rahul@users.noreply.github.com> Co-authored-by: Sukhman Singh <63765293+sukhman-sukh@users.noreply.github.com> Co-authored-by: acul71 <34693171+acul71@users.noreply.github.com> Co-authored-by: pacrob <5199899+pacrob@users.noreply.github.com>
73 lines
1.9 KiB
Python
73 lines
1.9 KiB
Python
from typing import (
|
|
Union,
|
|
)
|
|
|
|
from multiaddr import (
|
|
Multiaddr,
|
|
)
|
|
from p2pclient.libp2p_stubs.peer.id import ID as StubID
|
|
import trio
|
|
|
|
from libp2p.abc import IHost
|
|
from libp2p.peer.id import (
|
|
ID,
|
|
)
|
|
from libp2p.peer.peerinfo import (
|
|
PeerInfo,
|
|
)
|
|
|
|
from .daemon import (
|
|
Daemon,
|
|
)
|
|
|
|
TDaemonOrHost = Union[IHost, Daemon]
|
|
|
|
|
|
def _get_peer_info(node: TDaemonOrHost) -> PeerInfo:
|
|
peer_info: PeerInfo
|
|
if isinstance(node, Daemon):
|
|
peer_info = node.peer_info
|
|
else: # isinstance(node, IHost)
|
|
peer_id = node.get_id()
|
|
maddrs = [
|
|
node.get_addrs()[0].decapsulate(Multiaddr(f"/p2p/{peer_id.to_string()}"))
|
|
]
|
|
peer_info = PeerInfo(peer_id, maddrs)
|
|
return peer_info
|
|
|
|
|
|
async def _is_peer(peer_id: ID, node: TDaemonOrHost) -> bool:
|
|
if isinstance(node, Daemon):
|
|
pinfos = await node.control.list_peers()
|
|
peers = tuple([pinfo.peer_id for pinfo in pinfos])
|
|
return peer_id in peers
|
|
else: # isinstance(node, IHost)
|
|
return peer_id in node.get_network().connections
|
|
|
|
|
|
async def connect(a: TDaemonOrHost, b: TDaemonOrHost) -> None:
|
|
# Type check
|
|
err_msg = (
|
|
f"Type of a={type(a)} or type of b={type(b)} is wrong."
|
|
"Should be either `IHost` or `Daemon`"
|
|
)
|
|
assert all(
|
|
[isinstance(node, IHost) or isinstance(node, Daemon) for node in (a, b)]
|
|
), err_msg
|
|
|
|
b_peer_info = _get_peer_info(b)
|
|
if isinstance(a, Daemon):
|
|
# Convert internal libp2p ID to p2pclient stub ID .connect()
|
|
await a.control.connect(
|
|
StubID(b_peer_info.peer_id.to_bytes()), b_peer_info.addrs
|
|
)
|
|
else: # isinstance(b, IHost)
|
|
await a.connect(b_peer_info)
|
|
# Allow additional sleep for both side to establish the connection.
|
|
await trio.sleep(0.1)
|
|
|
|
a_peer_info = _get_peer_info(a)
|
|
|
|
assert await _is_peer(b_peer_info.peer_id, a)
|
|
assert await _is_peer(a_peer_info.peer_id, b)
|