Tighten input of normalize_int

Author: cburgdorf

eth/tools/_utils/normalization.py

@@ -57,6 +57,7 @@
 from eth.typing import (
     AccountState,
     GeneralState,
+    IntConvertible,
     Normalizer,
     TransactionDict,
     TransactionNormalizer,
@@ -67,16 +68,17 @@
 # Primitives
 #
 @functools.lru_cache(maxsize=1024)
-def normalize_int(value: Any) -> int:
+def normalize_int(value: IntConvertible) -> int:
     """
     Robust to integer conversion, handling hex values, string representations,
     and special cases like `0x`.
     """
     if is_integer(value):
-        return value
+        return cast(int, value)
     elif is_bytes(value):
         return big_endian_to_int(value)
     elif is_hex(value) and is_0x_prefixed(value):
+        value = cast(str, value)
         if len(value) == 2:
             return 0
         else:

eth/tools/fixtures/helpers.py

@@ -4,7 +4,6 @@
 
 from typing import (
     Any,
-    cast,
     Dict,
     Iterable,
     Tuple,

eth/typing.py

@@ -11,6 +11,7 @@
 
 from eth_typing import (
     Address,
+    HexStr,
 )
 from mypy_extensions import (
     TypedDict,
@@ -49,3 +50,5 @@
 TransactionNormalizer = Callable[[TransactionDict], TransactionDict]
 
 VRS = NewType("VRS", Tuple[int, int, int])
+
+IntConvertible = Union[int, bytes, HexStr, str]