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

Use trio.lowlevel instead of trio.hazmat

Browse Source 
Since trio 0.15.0, hazmat has been deprecated.

trio-typing and mypy are bumped to support newer trio and each other.
This commit is contained in:
Nguyễn Gia Phong 2021-02-23 22:02:34 +07:00
parent 12786f4e26
commit 080f8edc8e
11 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libp2p/pubsub/floodsub.py
View File

@ -64,7 +64,7 @@ class FloodSub(IPubsubRouter):
:param rpc: rpc message :param rpc: rpc message
""" """
# Checkpoint # Checkpoint
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async def publish(self, msg_forwarder: ID, pubsub_msg: rpc_pb2.Message) -> None: async def publish(self, msg_forwarder: ID, pubsub_msg: rpc_pb2.Message) -> None:
""" """
@ -112,7 +112,7 @@ class FloodSub(IPubsubRouter):
:param topic: topic to join :param topic: topic to join
""" """
# Checkpoint # Checkpoint
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async def leave(self, topic: str) -> None: async def leave(self, topic: str) -> None:
""" """
@ -122,7 +122,7 @@ class FloodSub(IPubsubRouter):
:param topic: topic to leave :param topic: topic to leave
""" """
# Checkpoint # Checkpoint
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
def _get_peers_to_send( def _get_peers_to_send(
self, topic_ids: Iterable[str], msg_forwarder: ID, origin: ID self, topic_ids: Iterable[str], msg_forwarder: ID, origin: ID

8
libp2p/pubsub/pubsub_notifee.py
View File

@ -32,10 +32,10 @@ class PubsubNotifee(INotifee):
self.dead_peers_queue = dead_peers_queue self.dead_peers_queue = dead_peers_queue
async def opened_stream(self, network: INetwork, stream: INetStream) -> None: async def opened_stream(self, network: INetwork, stream: INetStream) -> None:
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async def closed_stream(self, network: INetwork, stream: INetStream) -> None: async def closed_stream(self, network: INetwork, stream: INetStream) -> None:
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async def connected(self, network: INetwork, conn: INetConn) -> None: async def connected(self, network: INetwork, conn: INetConn) -> None:
""" """
@ -67,7 +67,7 @@ class PubsubNotifee(INotifee):
pass pass
async def listen(self, network: INetwork, multiaddr: Multiaddr) -> None: async def listen(self, network: INetwork, multiaddr: Multiaddr) -> None:
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async def listen_close(self, network: INetwork, multiaddr: Multiaddr) -> None: async def listen_close(self, network: INetwork, multiaddr: Multiaddr) -> None:
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()

2
libp2p/pubsub/subscription.py
View File

@ -10,7 +10,7 @@ from .typing import UnsubscribeFn
class BaseSubscriptionAPI(ISubscriptionAPI): class BaseSubscriptionAPI(ISubscriptionAPI):
async def __aenter__(self) -> "BaseSubscriptionAPI": async def __aenter__(self) -> "BaseSubscriptionAPI":
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
return self return self
async def __aexit__( async def __aexit__(

4
libp2p/security/noise/patterns.py
View File

@ -177,8 +177,6 @@ class PatternXX(BasePattern):
def _get_pubkey_from_noise_keypair(key_pair: NoiseKeyPair) -> PublicKey: def _get_pubkey_from_noise_keypair(key_pair: NoiseKeyPair) -> PublicKey:
# Use `Ed25519PublicKey` since 25519 is used in our pattern. # Use `Ed25519PublicKey` since 25519 is used in our pattern.
raw_bytes = key_pair.public.public_bytes( raw_bytes = key_pair.public.public_bytes(
# ignore "'Type[...]' has no attribute 'Raw'" serialization.Encoding.Raw, serialization.PublicFormat.Raw
serialization.Encoding.Raw, # type: ignore
serialization.PublicFormat.Raw, # type: ignore
) )
return Ed25519PublicKey.from_bytes(raw_bytes) return Ed25519PublicKey.from_bytes(raw_bytes)

2
libp2p/tools/factories.py
View File

@ -297,7 +297,7 @@ class DummyRouter(IPeerRouting):
self._routing_table[peer_id] = PeerInfo(peer_id, addrs) self._routing_table[peer_id] = PeerInfo(peer_id, addrs)
async def find_peer(self, peer_id: ID) -> PeerInfo: async def find_peer(self, peer_id: ID) -> PeerInfo:
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
return self._routing_table.get(peer_id, None) return self._routing_table.get(peer_id, None)

2
libp2p/tools/pubsub/floodsub_integration_test_settings.py
View File

@ -217,7 +217,7 @@ async def perform_test_from_obj(obj, pubsub_factory) -> None:
# Avoid repeated works # Avoid repeated works
if topic in queues_map[node_id]: if topic in queues_map[node_id]:
# Checkpoint # Checkpoint
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
return return
sub = await pubsub_map[node_id].subscribe(topic) sub = await pubsub_map[node_id].subscribe(topic)
queues_map[node_id][topic] = sub queues_map[node_id][topic] = sub

2
libp2p/transport/tcp/tcp.py
View File

@ -102,5 +102,5 @@ class TCP(ITransport):
def _multiaddr_from_socket(socket: trio.socket.SocketType) -> Multiaddr: def _multiaddr_from_socket(socket: trio.socket.SocketType) -> Multiaddr:
ip, port = socket.getsockname() # type: ignore ip, port = socket.getsockname()
return Multiaddr(f"/ip4/{ip}/tcp/{port}") return Multiaddr(f"/ip4/{ip}/tcp/{port}")

6
setup.py
View File

@ -14,11 +14,12 @@ extras_require = {
"lint": [ "lint": [
"flake8==3.7.9", # flake8 is not semver: it has added new warnings at minor releases "flake8==3.7.9", # flake8 is not semver: it has added new warnings at minor releases
"isort==4.3.21", "isort==4.3.21",
"mypy==0.740", # mypy is not semver: it has added new warnings at minor releases "mypy==0.780", # mypy is not semver: it has added new warnings at minor releases
"mypy-protobuf==1.15", "mypy-protobuf==1.15",
"black==19.3b0", "black==19.3b0",
"flake8-bugbear>=19.8.0,<20", "flake8-bugbear>=19.8.0,<20",
"docformatter>=1.3.1,<2", "docformatter>=1.3.1,<2",
"trio-typing~=0.5.0",
], ],
"doc": [ "doc": [
"Sphinx>=2.2.1,<3", "Sphinx>=2.2.1,<3",
@ -74,10 +75,9 @@ install_requires = [
"pynacl==1.3.0", "pynacl==1.3.0",
"dataclasses>=0.7, <1;python_version<'3.7'", "dataclasses>=0.7, <1;python_version<'3.7'",
"async_generator==1.10", "async_generator==1.10",
"trio>=0.13.0", "trio>=0.15.0",
"async-service>=0.1.0a6", "async-service>=0.1.0a6",
"async-exit-stack==1.0.1", "async-exit-stack==1.0.1",
"trio-typing>=0.3.0,<0.4.0",
"noiseprotocol>=0.3.0,<0.4.0", "noiseprotocol>=0.3.0,<0.4.0",
] ]

2
tests/pubsub/test_gossipsub.py
View File

@ -106,7 +106,7 @@ async def test_handle_graft(monkeypatch):
async def emit_prune(topic, sender_peer_id): async def emit_prune(topic, sender_peer_id):
event_emit_prune.set() event_emit_prune.set()
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
monkeypatch.setattr(gossipsubs[index_bob], "emit_prune", emit_prune) monkeypatch.setattr(gossipsubs[index_bob], "emit_prune", emit_prune)

20
tests/pubsub/test_pubsub.py
View File

@ -103,7 +103,7 @@ async def test_set_and_remove_topic_validator():
async def async_validator(peer_id, msg): async def async_validator(peer_id, msg):
nonlocal is_async_validator_called nonlocal is_async_validator_called
is_async_validator_called = True is_async_validator_called = True
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
topic = "TEST_VALIDATOR" topic = "TEST_VALIDATOR"
@ -155,7 +155,7 @@ async def test_get_msg_validators():
async def async_validator(peer_id, msg): async def async_validator(peer_id, msg):
nonlocal times_async_validator_called nonlocal times_async_validator_called
times_async_validator_called += 1 times_async_validator_called += 1
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
topic_1 = "TEST_VALIDATOR_1" topic_1 = "TEST_VALIDATOR_1"
topic_2 = "TEST_VALIDATOR_2" topic_2 = "TEST_VALIDATOR_2"
@ -201,11 +201,11 @@ async def test_validate_msg(is_topic_1_val_passed, is_topic_2_val_passed):
return False return False
async def passed_async_validator(peer_id, msg): async def passed_async_validator(peer_id, msg):
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
return True return True
async def failed_async_validator(peer_id, msg): async def failed_async_validator(peer_id, msg):
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
return False return False
topic_1 = "TEST_SYNC_VALIDATOR" topic_1 = "TEST_SYNC_VALIDATOR"
@ -238,7 +238,7 @@ async def test_validate_msg(is_topic_1_val_passed, is_topic_2_val_passed):
@pytest.mark.trio @pytest.mark.trio
async def test_continuously_read_stream(monkeypatch, nursery, security_protocol): async def test_continuously_read_stream(monkeypatch, nursery, security_protocol):
async def wait_for_event_occurring(event): async def wait_for_event_occurring(event):
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
with trio.fail_after(0.1): with trio.fail_after(0.1):
await event.wait() await event.wait()
@ -255,14 +255,14 @@ async def test_continuously_read_stream(monkeypatch, nursery, security_protocol)
async def mock_push_msg(msg_forwarder, msg): async def mock_push_msg(msg_forwarder, msg):
event_push_msg.set() event_push_msg.set()
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
def mock_handle_subscription(origin_id, sub_message): def mock_handle_subscription(origin_id, sub_message):
event_handle_subscription.set() event_handle_subscription.set()
async def mock_handle_rpc(rpc, sender_peer_id): async def mock_handle_rpc(rpc, sender_peer_id):
event_handle_rpc.set() event_handle_rpc.set()
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
with monkeypatch.context() as m: with monkeypatch.context() as m:
m.setattr(pubsubs_fsub[0], "push_msg", mock_push_msg) m.setattr(pubsubs_fsub[0], "push_msg", mock_push_msg)
@ -488,7 +488,7 @@ async def test_publish_push_msg_is_called(monkeypatch):
async def push_msg(msg_forwarder, msg): async def push_msg(msg_forwarder, msg):
msg_forwarders.append(msg_forwarder) msg_forwarders.append(msg_forwarder)
msgs.append(msg) msgs.append(msg)
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub: async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
with monkeypatch.context() as m: with monkeypatch.context() as m:
@ -525,7 +525,7 @@ async def test_push_msg(monkeypatch):
async def router_publish(*args, **kwargs): async def router_publish(*args, **kwargs):
event.set() event.set()
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
with monkeypatch.context() as m: with monkeypatch.context() as m:
m.setattr(pubsubs_fsub[0].router, "publish", router_publish) m.setattr(pubsubs_fsub[0].router, "publish", router_publish)
@ -626,7 +626,7 @@ async def test_strict_signing_failed_validation(monkeypatch):
# Use router publish to check if `push_msg` succeed. # Use router publish to check if `push_msg` succeed.
async def router_publish(*args, **kwargs): async def router_publish(*args, **kwargs):
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
# The event will only be set if `push_msg` succeed. # The event will only be set if `push_msg` succeed.
event.set() event.set()

2
tests_interop/conftest.py
View File

@ -122,7 +122,7 @@ async def py_to_daemon_stream_pair(p2pds, security_protocol, is_to_fail_daemon_s
nonlocal stream_daemon nonlocal stream_daemon
stream_daemon = DaemonStream(stream_info, stream) stream_daemon = DaemonStream(stream_info, stream)
event_stream_handled.set() event_stream_handled.set()
await trio.hazmat.checkpoint() await trio.lowlevel.checkpoint()
await p2pd.control.stream_handler(protocol_id, daemon_stream_handler) await p2pd.control.stream_handler(protocol_id, daemon_stream_handler)
# Sleep for a while to wait for the handler being registered. # Sleep for a while to wait for the handler being registered.