PR feedbacks

- Move exceptions to exceptions.py
- Raise `UpgradeFailure` in upgrader
- Refine the try/catch for upgraders in swarm
This commit is contained in:
mhchia
2019-08-21 23:04:59 +08:00
parent 3e04480d62
commit 16a4fd33c1
13 changed files with 97 additions and 66 deletions

View File

@ -3,7 +3,7 @@ import asyncio
import pytest
from libp2p.peer.peerinfo import info_from_p2p_addr
from libp2p.protocol_muxer.multiselect_client import MultiselectClientError
from libp2p.protocol_muxer.exceptions import MultiselectClientError
from tests.utils import cleanup, set_up_nodes_by_transport_opt
PROTOCOL_ID = "/chat/1.0.0"

View File

@ -1,6 +1,6 @@
import pytest
from libp2p.protocol_muxer.multiselect_client import MultiselectClientError
from libp2p.protocol_muxer.exceptions import MultiselectClientError
from tests.utils import cleanup, set_up_nodes_by_transport_opt
# TODO: Add tests for multiple streams being opened on different

View File

@ -4,9 +4,9 @@ import pytest
from libp2p import new_node
from libp2p.crypto.rsa import create_new_key_pair
from libp2p.network.exceptions import SwarmException
from libp2p.security.insecure.transport import InsecureSession, InsecureTransport
from libp2p.security.simple.transport import SimpleSecurityTransport
from libp2p.transport.exceptions import SecurityUpgradeFailure
from tests.configs import LISTEN_MADDR
from tests.utils import cleanup, connect
@ -161,7 +161,7 @@ async def test_multiple_security_none_the_same_fails():
def assertion_func(_):
assert False
with pytest.raises(SecurityUpgradeFailure):
with pytest.raises(SwarmException):
await perform_simple_test(
assertion_func, transports_for_initiator, transports_for_noninitiator
)