Use assert_type alongside cast (#1)

kkrt-labs · Jan 21, 2025 · e122ca6 · e122ca6
1 parent a83b0d0
commit e122ca6
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 17 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -113,7 +113,7 @@ python_requires = >=3.10
 install_requires =
     pycryptodome>=3,<4
     coincurve>=20,<21
-    typing_extensions>=4
+    typing_extensions>=4.2
     py_ecc @ git+https://github.com/petertdavies/py_ecc.git@127184f4c57b1812da959586d0fe8f43bb1a2389
     ethereum-types>=0.2.1,<0.3
 

diff --git a/src/ethereum/arrow_glacier/trie.py b/src/ethereum/arrow_glacier/trie.py
@@ -33,6 +33,7 @@
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
+from typing_extensions import assert_type
 
 from ethereum.crypto.hash import keccak256
 from ethereum.london import trie as previous_trie
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/berlin/trie.py b/src/ethereum/berlin/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/byzantium/trie.py b/src/ethereum/byzantium/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/cancun/trie.py b/src/ethereum/cancun/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -488,6 +489,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/constantinople/trie.py b/src/ethereum/constantinople/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/dao_fork/trie.py b/src/ethereum/dao_fork/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/frontier/trie.py b/src/ethereum/frontier/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -486,6 +487,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/gray_glacier/trie.py b/src/ethereum/gray_glacier/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/homestead/trie.py b/src/ethereum/homestead/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/istanbul/trie.py b/src/ethereum/istanbul/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/london/trie.py b/src/ethereum/london/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/muir_glacier/trie.py b/src/ethereum/muir_glacier/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/paris/trie.py b/src/ethereum/paris/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/shanghai/trie.py b/src/ethereum/shanghai/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -488,6 +489,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/spurious_dragon/trie.py b/src/ethereum/spurious_dragon/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )
diff --git a/src/ethereum/tangerine_whistle/trie.py b/src/ethereum/tangerine_whistle/trie.py
@@ -27,6 +27,7 @@
     Tuple,
     TypeVar,
     Union,
+    assert_type,
     cast,
 )
 
@@ -485,6 +486,6 @@ def patricialize(
         for k in range(16)
     )
     return BranchNode(
-        cast(BranchSubnodes, subnodes),
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )