HandshakeType should be required if it is required

Author: blast-hardcheese

replit_river/client.py

@@ -25,7 +25,7 @@ def __init__(
         client_id: str,
         server_id: str,
         transport_options: TransportOptions,
-        handshake_metadata: Optional[HandshakeType] = None,
+        handshake_metadata: HandshakeType,
     ) -> None:
         self._client_id = client_id
         self._server_id = server_id

replit_river/client_transport.py

@@ -51,7 +51,7 @@ def __init__(
         client_id: str,
         server_id: str,
         transport_options: TransportOptions,
-        handshake_metadata: Optional[HandshakeType] = None,
+        handshake_metadata: HandshakeType,
     ):
         super().__init__(
             transport_id=client_id,
@@ -276,7 +276,7 @@ async def _establish_handshake(
         transport_id: str,
         to_id: str,
         session_id: str,
-        handshake_metadata: Optional[HandshakeType],
+        handshake_metadata: HandshakeType,
         websocket: WebSocketCommonProtocol,
         old_session: Optional[ClientSession],
     ) -> Tuple[

tests/conftest.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from collections.abc import AsyncIterator
-from typing import Any, AsyncGenerator, NoReturn
+from typing import Any, AsyncGenerator, Literal
 
 import nanoid  # type: ignore
 import pytest
@@ -139,11 +139,12 @@ async def client(
 ) -> AsyncGenerator[Client, None]:
     try:
         async with serve(server.serve, "localhost", 8765):
-            client: Client[NoReturn] = Client(
+            client: Client[Literal[None]] = Client(
                 "ws://localhost:8765",
                 client_id="test_client",
                 server_id="test_server",
                 transport_options=transport_options,
+                handshake_metadata=None,
             )
             try:
                 yield client