dev: change type of branch node subnodes

ethereum · Dec 20, 2024 · 6783252 · 6783252
1 parent 1adcc1b
commit 6783252
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 64 deletions.
diff --git a/src/ethereum/arrow_glacier/trie.py b/src/ethereum/arrow_glacier/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/berlin/trie.py b/src/ethereum/berlin/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/byzantium/trie.py b/src/ethereum/byzantium/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/cancun/trie.py b/src/ethereum/cancun/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -100,7 +101,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -140,7 +141,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -462,9 +463,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/constantinople/trie.py b/src/ethereum/constantinople/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/dao_fork/trie.py b/src/ethereum/dao_fork/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/frontier/trie.py b/src/ethereum/frontier/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -96,7 +97,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -136,7 +137,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -460,9 +461,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/gray_glacier/trie.py b/src/ethereum/gray_glacier/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/homestead/trie.py b/src/ethereum/homestead/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )
diff --git a/src/ethereum/istanbul/trie.py b/src/ethereum/istanbul/trie.py
@@ -24,6 +24,7 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
@@ -97,7 +98,7 @@ class ExtensionNode:
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: Tuple[rlp.Extended, ...]
     value: rlp.Extended
 
 
@@ -137,7 +138,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -459,9 +460,9 @@ def patricialize(
             branches[key[level]][key] = obj[key]
 
     return BranchNode(
-        [
+        (
             encode_internal_node(patricialize(branches[k], level + Uint(1)))
             for k in range(16)
-        ],
+        ),
         value,
     )