Parcourir la source

Apply suggestions from code review

Co-authored-by: Alexander Borzunov <hxrussia@gmail.com>
Denis Mazur il y a 4 ans
Parent
commit
8d4f4a4baa
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 2 2
      hivemind/p2p/p2p_daemon.py
  2. 1 1
      hivemind/p2p/p2p_daemon_bindings/control.py

+ 2 - 2
hivemind/p2p/p2p_daemon.py

@@ -384,6 +384,7 @@ class P2P:
         :param stream_input: If True, assume ``handler`` to take ``TInputStream``
         :param stream_input: If True, assume ``handler`` to take ``TInputStream``
                              (not just ``TInputProtobuf``) as input.
                              (not just ``TInputProtobuf``) as input.
         :param stream_output: If True, assume ``handler`` to return ``TOutputStream``
         :param stream_output: If True, assume ``handler`` to return ``TOutputStream``
+                              (not ``Awaitable[TOutputProtobuf]``).
         """
         """
 
 
         if not stream_input and not stream_output:
         if not stream_input and not stream_output:
@@ -402,7 +403,6 @@ class P2P:
 
 
         await self._add_protobuf_stream_handler(name, _stream_handler, input_protobuf_type)
         await self._add_protobuf_stream_handler(name, _stream_handler, input_protobuf_type)
 
 
-    # only registers request-response handlers
     async def _add_protobuf_unary_handler(
     async def _add_protobuf_unary_handler(
         self,
         self,
         handle_name: str,
         handle_name: str,
@@ -455,7 +455,7 @@ class P2P:
     ) -> Awaitable[TOutputProtobuf]:
     ) -> Awaitable[TOutputProtobuf]:
         serialized_input = input.SerializeToString()
         serialized_input = input.SerializeToString()
         response = await self._client.call_unary_handler(peer_id, handle_name, serialized_input)
         response = await self._client.call_unary_handler(peer_id, handle_name, serialized_input)
-        return output_protobuf_type().FromString(response)
+        return output_protobuf_type.FromString(response)
 
 
     def iterate_protobuf_handler(
     def iterate_protobuf_handler(
         self,
         self,

+ 1 - 1
hivemind/p2p/p2p_daemon_bindings/control.py

@@ -228,7 +228,7 @@ class ControlClient:
             return await self._pending_calls[call_id]
             return await self._pending_calls[call_id]
 
 
         except asyncio.CancelledError:
         except asyncio.CancelledError:
-            asyncio.create_task(self._send_call_cancel(call_id))
+            await self._send_call_cancel(call_id)
             raise
             raise
 
 
         finally:
         finally: