fix: remove # type: ignore after each REQUIRED (#765)

* remove # type: ignore after each REQUIRED

* more cleanup

* more cleanup

* fix more

* fix merge issues

* fix linter

* better typing

* remove more

* remove more

* fix mypy

Author: mvadari

tools/generate_tx_models.py

@@ -132,7 +132,7 @@ def _generate_param_line(param: str, is_required: bool) -> str:
             param_name = param[2:]
             param_type = sfields[param_name][0]
             if is_required:
-                param_type_output = f"{TYPE_MAP[param_type]} = REQUIRED  # type: ignore"
+                param_type_output = f"{TYPE_MAP[param_type]} = REQUIRED"
             else:
                 param_type_output = f"Optional[{TYPE_MAP[param_type]}] = None"
             return f"    {_key_to_json(param_name)}: {param_type_output}"

xrpl/asyncio/clients/websocket_base.py

@@ -8,7 +8,8 @@
 from typing import TYPE_CHECKING, Any, Dict, Optional, cast
 
 from typing_extensions import Final, Self
-from websockets import client as websocket_client
+from websockets.asyncio import client as websocket_client
+from websockets.protocol import State
 
 from xrpl.asyncio.clients.client import Client
 from xrpl.asyncio.clients.exceptions import XRPLWebsocketException
@@ -65,7 +66,7 @@ def __init__(self: Self, url: str) -> None:
             url: The URL of the rippled node to submit requests to.
         """
         self._open_requests: _REQUESTS_TYPE = {}
-        self._websocket: Optional[websocket_client.WebSocketClientProtocol] = None
+        self._websocket: Optional[websocket_client.ClientConnection] = None
         self._handler_task: Optional[_HANDLER_TYPE] = None
         # unfortunately, we cannot create the Queue here because it needs to be
         # tied to a currently-running event loop. the sync websocket client
@@ -85,7 +86,7 @@ def is_open(self: Self) -> bool:
             self._handler_task is not None
             and self._messages is not None
             and self._websocket is not None
-            and self._websocket.open
+            and self._websocket.state == State.OPEN
         )
 
     async def _do_open(self: Self) -> None:
@@ -119,7 +120,7 @@ async def _do_close(self: Self) -> None:
         self._messages = None
 
         # close the connection
-        await cast(websocket_client.WebSocketClientProtocol, self._websocket).close()
+        await cast(websocket_client.ClientConnection, self._websocket).close()
 
     async def _handler(self: Self) -> None:
         """
@@ -131,9 +132,7 @@ async def _handler(self: Self) -> None:
 
         As long as a given client remains open, this handler will be running as a Task.
         """
-        async for response in cast(
-            websocket_client.WebSocketClientProtocol, self._websocket
-        ):
+        async for response in cast(websocket_client.ClientConnection, self._websocket):
             response_dict = json.loads(response)
 
             # if this response corresponds to request, fulfill the Future
@@ -175,7 +174,7 @@ async def _do_send_no_future(self: Self, request: Request) -> None:
         Arguments:
             request: The request to send.
         """
-        await cast(websocket_client.WebSocketClientProtocol, self._websocket).send(
+        await cast(websocket_client.ClientConnection, self._websocket).send(
             json.dumps(
                 request_to_websocket(request),
             ),

xrpl/models/amounts/issued_currency_amount.py

@@ -25,7 +25,7 @@ class IssuedCurrencyAmount(IssuedCurrency):
     See https://xrpl.org/currency-formats.html#issued-currency-amounts.
     """
 
-    value: Union[str, int, float] = REQUIRED  # type: ignore
+    value: Union[str, int, float] = REQUIRED
     """
     This field is required.
 

xrpl/models/amounts/mpt_amount.py

@@ -18,14 +18,14 @@
 class MPTAmount(BaseModel):
     """Specifies an MPT amount."""
 
-    mpt_issuance_id: str = REQUIRED  # type: ignore
+    mpt_issuance_id: str = REQUIRED
     """
     This field is required.
 
     :meta hide-value:
     """
 
-    value: str = REQUIRED  # type: ignore
+    value: str = REQUIRED
     """
     This field is required.
 

xrpl/models/auth_account.py

@@ -14,7 +14,7 @@
 class AuthAccount(NestedModel):
     """Represents one entry in a list of AuthAccounts used in AMMBid transaction."""
 
-    account: str = REQUIRED  # type: ignore
+    account: str = REQUIRED
     """
     This field is required.
 

xrpl/models/base_model.py

@@ -187,7 +187,7 @@ def _from_dict_single_param(
 
         # no more collections (no params expect a Dict)
 
-        if param_type is Any:  # type: ignore
+        if param_type is Any:
             # param_type is Any (e.g. will accept anything)
             return param_value
 
@@ -318,7 +318,7 @@ def _check_type(
             return {attr: f"{attr} is {type(value)}, expected {expected_type}"}
 
         # unsure what the problem with mypy is here
-        if expected_type is Any:  # type: ignore[comparison-overlap]
+        if expected_type is Any:
             return {}
 
         if expected_type_origin is list:

xrpl/models/currencies/issued_currency.py

@@ -36,14 +36,14 @@ class IssuedCurrency(BaseModel):
     See https://xrpl.org/currency-formats.html#specifying-currency-amounts
     """
 
-    currency: str = REQUIRED  # type: ignore
+    currency: str = REQUIRED
     """
     This field is required.
 
     :meta hide-value:
     """
 
-    issuer: str = REQUIRED  # type: ignore
+    issuer: str = REQUIRED
     """
     This field is required.
 

xrpl/models/currencies/mpt_currency.py

@@ -33,7 +33,7 @@ class MPTCurrency(BaseModel):
     See https://xrpl.org/currency-formats.html#specifying-currency-amounts
     """
 
-    mpt_issuance_id: str = REQUIRED  # type: ignore
+    mpt_issuance_id: str = REQUIRED
     """
     This field is required.
 

xrpl/models/requests/account_channels.py

@@ -30,7 +30,7 @@ class AccountChannels(Request, LookupByLedgerRequest):
     """
 
     method: RequestMethod = field(default=RequestMethod.ACCOUNT_CHANNELS, init=False)
-    account: str = REQUIRED  # type: ignore
+    account: str = REQUIRED
     """
     This field is required.
 

xrpl/models/requests/account_currencies.py

@@ -28,7 +28,7 @@ class AccountCurrencies(Request, LookupByLedgerRequest):
     `See account_currencies <https://xrpl.org/account_currencies.html>`_
     """
 
-    account: str = REQUIRED  # type: ignore
+    account: str = REQUIRED
     """
     This field is required.