StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: StreamReset in the stream handlers

Browse Source 
Since we don't catch `Exception` in the stream handlers, catch them in
the stream handlers in the tests.
This commit is contained in:
mhchia 2020-02-04 20:46:40 +08:00
parent a7ba59bf9f
commit 0548d28568
No known key found for this signature in database
GPG Key ID: 389EFBEA1362589A
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libp2p/tools/utils.py
View File

@ -1,6 +1,7 @@
from typing import Awaitable, Callable from typing import Awaitable, Callable
from libp2p.host.host_interface import IHost from libp2p.host.host_interface import IHost
from libp2p.network.stream.exceptions import StreamError
from libp2p.network.stream.net_stream_interface import INetStream from libp2p.network.stream.net_stream_interface import INetStream
from libp2p.network.swarm import Swarm from libp2p.network.swarm import Swarm
from libp2p.peer.peerinfo import info_from_p2p_addr from libp2p.peer.peerinfo import info_from_p2p_addr
@ -33,9 +34,15 @@ def create_echo_stream_handler(
) -> Callable[[INetStream], Awaitable[None]]: ) -> Callable[[INetStream], Awaitable[None]]:
async def echo_stream_handler(stream: INetStream) -> None: async def echo_stream_handler(stream: INetStream) -> None:
while True: while True:
read_string = (await stream.read(MAX_READ_LEN)).decode() try:
read_string = (await stream.read(MAX_READ_LEN)).decode()
except StreamError:
break
resp = ack_prefix + read_string resp = ack_prefix + read_string
await stream.write(resp.encode()) try:
await stream.write(resp.encode())
except StreamError:
break
return echo_stream_handler return echo_stream_handler

16
tests/libp2p/test_libp2p.py
View File

@ -1,6 +1,7 @@
import multiaddr import multiaddr
import pytest import pytest
from libp2p.network.stream.exceptions import StreamError
from libp2p.tools.constants import MAX_READ_LEN from libp2p.tools.constants import MAX_READ_LEN
from libp2p.tools.factories import HostFactory from libp2p.tools.factories import HostFactory
from libp2p.tools.utils import connect, create_echo_stream_handler from libp2p.tools.utils import connect, create_echo_stream_handler
@ -42,13 +43,22 @@ async def test_double_response(is_host_secure):
async def double_response_stream_handler(stream): async def double_response_stream_handler(stream):
while True: while True:
read_string = (await stream.read(MAX_READ_LEN)).decode() try:
read_string = (await stream.read(MAX_READ_LEN)).decode()
except StreamError:
break
response = ACK_STR_0 + read_string response = ACK_STR_0 + read_string
await stream.write(response.encode()) try:
await stream.write(response.encode())
except StreamError:
break
response = ACK_STR_1 + read_string response = ACK_STR_1 + read_string
await stream.write(response.encode()) try:
await stream.write(response.encode())
except StreamError:
break
hosts[1].set_stream_handler(PROTOCOL_ID_0, double_response_stream_handler) hosts[1].set_stream_handler(PROTOCOL_ID_0, double_response_stream_handler)