mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2025-12-31 20:36:24 +00:00
4b1860766d
* feat: Replace mplex with yamux as default multiplexer in py-libp2p * Retain Mplex alongside Yamux in new_swarm with messaging that Yamux is preferred * moved !BBHII to a constant YAMUX_HEADER_FORMAT at the top of yamux.py with a comment explaining its structure * renamed the news fragment to 534.feature.rst and updated the description * renamed the news fragment to 534.feature.rst and updated the description * added a docstring to clarify that Yamux does not support deadlines natively * Remove the __main__ block entirely from test_yamux.py * Replaced the print statements in test_yamux.py with logging.debug * Added a comment linking to the spec for clarity * Raise NotImplementedError in YamuxStream.set_deadline per review * Add muxed_conn to YamuxStream and test deadline NotImplementedError * Fix Yamux implementation to meet libp2p spec * Fix None handling in YamuxStream.read and Yamux.read_stream * Fix test_connected_peers.py to correctly handle peer connections * fix: Ensure StreamReset is raised on read after local reset in yamux * fix: Map MuxedStreamError to StreamClosed in NetStream.write for Yamux * fix: Raise MuxedStreamReset in Yamux.read_stream for closed streams * fix: Correct Yamux stream read behavior for NetStream tests Fixed est_net_stream_read_after_remote_closed by updating NetStream.read to raise StreamEOF when the stream is remotely closed and no data is available, aligning with test expectations and Fixed est_net_stream_read_until_eof by modifying YamuxStream.read to block until the stream is closed ( ecv_closed=True) for =-1 reads, ensuring data is only returned after remote closure. * fix: Correct Yamux stream read behavior for NetStream tests Fixed est_net_stream_read_after_remote_closed by updating NetStream.read to raise StreamEOF when the stream is remotely closed and no data is available, aligning with test expectations and Fixed est_net_stream_read_until_eof by modifying YamuxStream.read to block until the stream is closed ( ecv_closed=True) for =-1 reads, ensuring data is only returned after remote closure. * fix: raise StreamEOF when reading from closed stream with empty buffer * fix: prioritize returning buffered data even after stream reset * fix: prioritize returning buffered data even after stream reset * fix: Ensure test_net_stream_read_after_remote_closed_and_reset passes in full suite * fix: Add __init__.py to yamux module to fix documentation build * fix: Add __init__.py to yamux module to fix documentation build * fix: Add libp2p.stream_muxer.yamux to libp2p.stream_muxer.rst toctree * fix: Correct title underline length in libp2p.stream_muxer.yamux.rst * fix: Add a = so that is matches the libp2p.stream\_muxer.yamux length * fix(tests): Resolve race condition in network notification test * fix: fixing failing tests and examples with yamux and noise * refactor: remove debug logging and improve x25519 tests * fix: Add functionality for users to choose between Yamux and Mplex * fix: increased trio sleep to 0.1 sec for slow environment * feat: Add test for switching between Yamux and mplex * refactor: move host fixtures to interop tests * chore: Update __init__.py removing unused import removed unused ```python import os import logging ``` * lint: fix import order * fix: Resolve conftest.py conflict by removing trio test support * fix: Resolve test skipping by keeping trio test support * Fix: add a newline at end of the file --------- Co-authored-by: acul71 <luca.pisani@birdo.net> Co-authored-by: acul71 <34693171+acul71@users.noreply.github.com>
116 lines
3.8 KiB
Python
116 lines
3.8 KiB
Python
import pytest
|
|
import trio
|
|
|
|
from libp2p.peer.peerinfo import (
|
|
info_from_p2p_addr,
|
|
)
|
|
from tests.utils.factories import (
|
|
HostFactory,
|
|
)
|
|
|
|
|
|
async def connect_two(host_a, host_b, host_c):
|
|
# Initially all of the hosts are disconnected
|
|
assert (len(host_a.get_connected_peers())) == 0
|
|
assert (len(host_b.get_connected_peers())) == 0
|
|
assert (len(host_c.get_connected_peers())) == 0
|
|
|
|
# Connecting hostA with hostB
|
|
addr = host_b.get_addrs()[0]
|
|
info = info_from_p2p_addr(addr)
|
|
await host_a.connect(info)
|
|
|
|
# Since hostA and hostB are connected now
|
|
assert (len(host_a.get_connected_peers())) == 1
|
|
assert (len(host_b.get_connected_peers())) == 1
|
|
assert (len(host_c.get_connected_peers())) == 0
|
|
assert host_a.get_connected_peers()[0] == host_b.get_id()
|
|
assert host_b.get_connected_peers()[0] == host_a.get_id()
|
|
|
|
|
|
async def connect_three_cyclic(host_a, host_b, host_c):
|
|
# Connecting hostA with hostB
|
|
addr = host_b.get_addrs()[0]
|
|
infoB = info_from_p2p_addr(addr)
|
|
await host_a.connect(infoB)
|
|
|
|
# Connecting hostB with hostC
|
|
addr = host_c.get_addrs()[0]
|
|
infoC = info_from_p2p_addr(addr)
|
|
await host_b.connect(infoC)
|
|
|
|
# Connecting hostC with hostA
|
|
addr = host_a.get_addrs()[0]
|
|
infoA = info_from_p2p_addr(addr)
|
|
await host_c.connect(infoA)
|
|
|
|
# Performing checks
|
|
assert (len(host_a.get_connected_peers())) == 2
|
|
assert (len(host_b.get_connected_peers())) == 2
|
|
assert (len(host_c.get_connected_peers())) == 2
|
|
assert host_a.get_connected_peers() == [host_b.get_id(), host_c.get_id()]
|
|
assert host_b.get_connected_peers() == [host_a.get_id(), host_c.get_id()]
|
|
assert host_c.get_connected_peers() == [host_b.get_id(), host_a.get_id()]
|
|
|
|
|
|
async def connect_two_to_one(host_a, host_b, host_c):
|
|
# Connecting hostA and hostC to hostB
|
|
addr = host_b.get_addrs()[0]
|
|
infoB = info_from_p2p_addr(addr)
|
|
await host_a.connect(infoB)
|
|
await host_c.connect(infoB)
|
|
|
|
# Performing checks
|
|
assert (len(host_a.get_connected_peers())) == 1
|
|
assert (len(host_b.get_connected_peers())) == 2
|
|
assert (len(host_c.get_connected_peers())) == 1
|
|
assert host_a.get_connected_peers() == [host_b.get_id()]
|
|
assert host_b.get_connected_peers() == [host_a.get_id(), host_c.get_id()]
|
|
assert host_c.get_connected_peers() == [host_b.get_id()]
|
|
|
|
|
|
async def connect_and_disconnect(host_a, host_b, host_c):
|
|
# Connecting hostB to hostA and hostC
|
|
addr = host_a.get_addrs()[0]
|
|
infoA = info_from_p2p_addr(addr)
|
|
await host_b.connect(infoA)
|
|
addr = host_c.get_addrs()[0]
|
|
infoC = info_from_p2p_addr(addr)
|
|
await host_b.connect(infoC)
|
|
|
|
# Performing checks
|
|
assert (len(host_a.get_connected_peers())) == 1
|
|
assert (len(host_b.get_connected_peers())) == 2
|
|
assert (len(host_c.get_connected_peers())) == 1
|
|
assert host_a.get_connected_peers() == [host_b.get_id()]
|
|
assert host_b.get_connected_peers() == [host_a.get_id(), host_c.get_id()]
|
|
assert host_c.get_connected_peers() == [host_b.get_id()]
|
|
|
|
# Disconnecting hostB and hostA
|
|
await host_b.disconnect(host_a.get_id())
|
|
await trio.sleep(0.5)
|
|
|
|
# Performing checks
|
|
assert (len(host_a.get_connected_peers())) == 0
|
|
assert (len(host_b.get_connected_peers())) == 1
|
|
assert (len(host_c.get_connected_peers())) == 1
|
|
assert host_b.get_connected_peers() == [host_c.get_id()]
|
|
assert host_c.get_connected_peers() == [host_b.get_id()]
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"test",
|
|
[
|
|
(connect_two),
|
|
(connect_three_cyclic),
|
|
(connect_two_to_one),
|
|
(connect_and_disconnect),
|
|
],
|
|
)
|
|
@pytest.mark.trio
|
|
async def test_connected_peers(test, security_protocol):
|
|
async with HostFactory.create_batch_and_listen(
|
|
3, security_protocol=security_protocol
|
|
) as hosts:
|
|
await test(hosts[0], hosts[1], hosts[2])
|