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>
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
import pytest
|
|
import trio
|
|
|
|
from libp2p.crypto.rsa import (
|
|
create_new_key_pair,
|
|
)
|
|
from libp2p.security.insecure.transport import (
|
|
PLAINTEXT_PROTOCOL_ID,
|
|
InsecureSession,
|
|
)
|
|
from libp2p.security.noise.transport import PROTOCOL_ID as NOISE_PROTOCOL_ID
|
|
from libp2p.security.secio.transport import ID as SECIO_PROTOCOL_ID
|
|
from libp2p.security.secure_session import (
|
|
SecureSession,
|
|
)
|
|
from tests.utils.factories import (
|
|
host_pair_factory,
|
|
)
|
|
|
|
initiator_key_pair = create_new_key_pair()
|
|
|
|
noninitiator_key_pair = create_new_key_pair()
|
|
|
|
|
|
async def perform_simple_test(assertion_func, security_protocol):
|
|
async with host_pair_factory(security_protocol=security_protocol) as hosts:
|
|
# Use a different approach to verify connections
|
|
# Wait for both sides to establish connection
|
|
for _ in range(5): # Try up to 5 times
|
|
try:
|
|
# Check if connection established from host0 to host1
|
|
conn_0 = hosts[0].get_network().connections.get(hosts[1].get_id())
|
|
# Check if connection established from host1 to host0
|
|
conn_1 = hosts[1].get_network().connections.get(hosts[0].get_id())
|
|
|
|
if conn_0 and conn_1:
|
|
break
|
|
|
|
# Wait a bit and retry
|
|
await trio.sleep(0.2)
|
|
except Exception:
|
|
# Wait a bit and retry
|
|
await trio.sleep(0.2)
|
|
|
|
# If we couldn't establish connection after retries,
|
|
# the test will fail with clear error
|
|
assert conn_0 is not None, "Failed to establish connection from host0 to host1"
|
|
assert conn_1 is not None, "Failed to establish connection from host1 to host0"
|
|
|
|
# Perform assertion
|
|
assertion_func(conn_0.muxed_conn.secured_conn)
|
|
assertion_func(conn_1.muxed_conn.secured_conn)
|
|
|
|
|
|
@pytest.mark.trio
|
|
@pytest.mark.parametrize(
|
|
"security_protocol, transport_type",
|
|
(
|
|
(PLAINTEXT_PROTOCOL_ID, InsecureSession),
|
|
(SECIO_PROTOCOL_ID, SecureSession),
|
|
(NOISE_PROTOCOL_ID, SecureSession),
|
|
),
|
|
)
|
|
@pytest.mark.trio
|
|
async def test_single_insecure_security_transport_succeeds(
|
|
security_protocol, transport_type
|
|
):
|
|
def assertion_func(conn):
|
|
assert isinstance(conn, transport_type)
|
|
|
|
await perform_simple_test(assertion_func, security_protocol)
|
|
|
|
|
|
@pytest.mark.trio
|
|
async def test_default_insecure_security():
|
|
def assertion_func(conn):
|
|
assert isinstance(conn, InsecureSession)
|
|
|
|
await perform_simple_test(assertion_func, None)
|