Enable Type Hinting Completely

eth_keys/datatypes.py

@@ -3,7 +3,13 @@
 import codecs
 import collections
 import sys
-from typing import (Any, Optional, Tuple, Union, Type)  # noqa: F401
+from typing import (    # noqa: F401
+    Any,
+    Tuple,
+    Union,
+    Type,
+    TYPE_CHECKING,
+)
 
 from eth_utils import (
     big_endian_to_int,
@@ -39,11 +45,7 @@
     validate_signature_bytes,
 )
 
-
-# Workaround for import cycles caused by type annotations:
-# http://mypy.readthedocs.io/en/latest/common_issues.html#import-cycles
-MYPY = False
-if MYPY:
+if TYPE_CHECKING:
     from eth_keys.backends.base import BaseECCBackend  # noqa: F401
 
 
@@ -83,21 +85,21 @@ def __init__(self,
 
         self.backend = backend
 
-    _backend = None  # type: bytes
+    _backend = None  # type: BaseECCBackend
 
     @property
-    def backend(self):
+    def backend(self) -> 'BaseECCBackend':
         if self._backend is None:
             return self.get_backend()
         else:
             return self._backend
 
     @backend.setter
-    def backend(self, value):
+    def backend(self, value: 'BaseECCBackend') -> None:
         self._backend = value
 
     @classmethod
-    def get_backend(cls, *args, **kwargs):
+    def get_backend(cls, *args: Any, **kwargs: Any) -> 'BaseECCBackend':
         from eth_keys.backends import get_backend
         return get_backend(*args, **kwargs)
 
@@ -335,8 +337,7 @@ def __bytes__(self) -> bytes:
         vb = int_to_byte(self.v)
         rb = pad32(int_to_big_endian(self.r))
         sb = pad32(int_to_big_endian(self.s))
-        # FIXME: Enable type checking once we have type annotations in eth_utils
-        return b''.join((rb, sb, vb))  # type: ignore
+        return b''.join((rb, sb, vb))
 
     def __str__(self) -> str:
         return self.to_hex()

eth_keys/main.py

@@ -33,10 +33,8 @@ class KeyAPI(LazyBackend):
     # Proxy method calls to the backends
     #
     def ecdsa_sign(self,
-                   message_hash,  # type: bytes
-                   private_key  # type: _PrivateKey
-                   ):
-        # type: (...) -> _Signature
+                   message_hash: bytes,
+                   private_key: _PrivateKey) -> _Signature:
         validate_message_hash(message_hash)
         if not isinstance(private_key, PrivateKey):
             raise ValidationError(
@@ -51,21 +49,18 @@ def ecdsa_sign(self,
         return signature
 
     def ecdsa_verify(self,
-                     message_hash,  # type: bytes
-                     signature,  # type: _Signature
-                     public_key  # type: _PublicKey
-                     ) -> bool:
+                     message_hash: bytes,
+                     signature: _Signature,
+                     public_key: _PublicKey) -> bool:
         if not isinstance(public_key, PublicKey):
             raise ValidationError(
                 "The `public_key` must be an instance of `eth_keys.datatypes.PublicKey`"
             )
         return self.ecdsa_recover(message_hash, signature) == public_key
 
     def ecdsa_recover(self,
-                      message_hash,  # type: bytes
-                      signature  # type: _Signature
-                      ):
-        # type: (...) -> _PublicKey
+                      message_hash: bytes,
+                      signature: _Signature) -> _PublicKey:
         validate_message_hash(message_hash)
         if not isinstance(signature, Signature):
             raise ValidationError(
@@ -79,7 +74,7 @@ def ecdsa_recover(self,
             )
         return public_key
 
-    def private_key_to_public_key(self, private_key):
+    def private_key_to_public_key(self, private_key: _PrivateKey) -> _PublicKey:
         if not isinstance(private_key, PrivateKey):
             raise ValidationError(
                 "The `private_key` must be an instance of `eth_keys.datatypes.PrivateKey`"

setup.py

@@ -24,6 +24,7 @@
     py_modules=['eth_keys'],
     license="MIT",
     zip_safe=False,
+    package_data={'eth-keys': ['py.typed']},
     keywords='ethereum',
     packages=find_packages(exclude=["tests", "tests.*"]),
     classifiers=[

tox.ini

@@ -35,4 +35,4 @@ deps=mypy<0.600
 setenv=MYPYPATH={toxinidir}
 # TODO: Drop --ignore-missing-imports once we have type annotations for eth_utils, coincurve and cytoolz
 commands=
-    mypy --ignore-missing-imports --check-untyped-defs --disallow-incomplete-defs -p eth_keys
+    mypy --follow-imports=silent --warn-unused-ignores --ignore-missing-imports --no-strict-optional --check-untyped-defs --disallow-incomplete-defs --disallow-untyped-defs --disallow-any-generics -p eth_keys