Skip to content

Commit 11daa56

Browse files
ClementWalterSamWilsn
ClementWalter
authored and
SamWilsn
committed
Import Extended type directly instead of using rlp.Extended
1 parent 7838e76 commit 11daa56

File tree

17 files changed

+394
-394
lines changed

17 files changed

+394
-394
lines changed

‎src/ethereum/arrow_glacier/trie.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
cast,
3131
)
3232

33-
from ethereum_rlp import rlp
33+
from ethereum_rlp import Extended, rlp
3434
from ethereum_types.bytes import Bytes
3535
from ethereum_types.frozen import slotted_freezable
3636
from ethereum_types.numeric import U256, Uint
@@ -83,7 +83,7 @@ class LeafNode:
8383
"""Leaf node in the Merkle Trie"""
8484

8585
rest_of_key: Bytes
86-
value: rlp.Extended
86+
value: Extended
8787

8888

8989
@slotted_freezable
@@ -92,26 +92,26 @@ class ExtensionNode:
9292
"""Extension node in the Merkle Trie"""
9393

9494
key_segment: Bytes
95-
subnode: rlp.Extended
95+
subnode: Extended
9696

9797

9898
BranchSubnodes = Tuple[
99-
rlp.Extended,
100-
rlp.Extended,
101-
rlp.Extended,
102-
rlp.Extended,
103-
rlp.Extended,
104-
rlp.Extended,
105-
rlp.Extended,
106-
rlp.Extended,
107-
rlp.Extended,
108-
rlp.Extended,
109-
rlp.Extended,
110-
rlp.Extended,
111-
rlp.Extended,
112-
rlp.Extended,
113-
rlp.Extended,
114-
rlp.Extended,
99+
Extended,
100+
Extended,
101+
Extended,
102+
Extended,
103+
Extended,
104+
Extended,
105+
Extended,
106+
Extended,
107+
Extended,
108+
Extended,
109+
Extended,
110+
Extended,
111+
Extended,
112+
Extended,
113+
Extended,
114+
Extended,
115115
]
116116

117117

@@ -121,13 +121,13 @@ class BranchNode:
121121
"""Branch node in the Merkle Trie"""
122122

123123
subnodes: BranchSubnodes
124-
value: rlp.Extended
124+
value: Extended
125125

126126

127127
InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
128128

129129

130-
def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
130+
def encode_internal_node(node: Optional[InternalNode]) -> Extended:
131131
"""
132132
Encodes a Merkle Trie node into its RLP form. The RLP will then be
133133
serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -146,7 +146,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
146146
encoded : `rlp.RLP`
147147
The node encoded as RLP.
148148
"""
149-
unencoded: rlp.Extended
149+
unencoded: Extended
150150
if node is None:
151151
unencoded = b""
152152
elif isinstance(node, LeafNode):
@@ -486,6 +486,6 @@ def patricialize(
486486
for k in range(16)
487487
)
488488
return BranchNode(
489-
cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
489+
cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
490490
value,
491491
)

‎src/ethereum/berlin/trie.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
cast,
3131
)
3232

33-
from ethereum_rlp import rlp
33+
from ethereum_rlp import Extended, rlp
3434
from ethereum_types.bytes import Bytes
3535
from ethereum_types.frozen import slotted_freezable
3636
from ethereum_types.numeric import U256, Uint
@@ -83,7 +83,7 @@ class LeafNode:
8383
"""Leaf node in the Merkle Trie"""
8484

8585
rest_of_key: Bytes
86-
value: rlp.Extended
86+
value: Extended
8787

8888

8989
@slotted_freezable
@@ -92,26 +92,26 @@ class ExtensionNode:
9292
"""Extension node in the Merkle Trie"""
9393

9494
key_segment: Bytes
95-
subnode: rlp.Extended
95+
subnode: Extended
9696

9797

9898
BranchSubnodes = Tuple[
99-
rlp.Extended,
100-
rlp.Extended,
101-
rlp.Extended,
102-
rlp.Extended,
103-
rlp.Extended,
104-
rlp.Extended,
105-
rlp.Extended,
106-
rlp.Extended,
107-
rlp.Extended,
108-
rlp.Extended,
109-
rlp.Extended,
110-
rlp.Extended,
111-
rlp.Extended,
112-
rlp.Extended,
113-
rlp.Extended,
114-
rlp.Extended,
99+
Extended,
100+
Extended,
101+
Extended,
102+
Extended,
103+
Extended,
104+
Extended,
105+
Extended,
106+
Extended,
107+
Extended,
108+
Extended,
109+
Extended,
110+
Extended,
111+
Extended,
112+
Extended,
113+
Extended,
114+
Extended,
115115
]
116116

117117

@@ -121,13 +121,13 @@ class BranchNode:
121121
"""Branch node in the Merkle Trie"""
122122

123123
subnodes: BranchSubnodes
124-
value: rlp.Extended
124+
value: Extended
125125

126126

127127
InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
128128

129129

130-
def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
130+
def encode_internal_node(node: Optional[InternalNode]) -> Extended:
131131
"""
132132
Encodes a Merkle Trie node into its RLP form. The RLP will then be
133133
serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -146,7 +146,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
146146
encoded : `rlp.RLP`
147147
The node encoded as RLP.
148148
"""
149-
unencoded: rlp.Extended
149+
unencoded: Extended
150150
if node is None:
151151
unencoded = b""
152152
elif isinstance(node, LeafNode):
@@ -486,6 +486,6 @@ def patricialize(
486486
for k in range(16)
487487
)
488488
return BranchNode(
489-
cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
489+
cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
490490
value,
491491
)

‎src/ethereum/byzantium/trie.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
cast,
3131
)
3232

33-
from ethereum_rlp import rlp
33+
from ethereum_rlp import Extended, rlp
3434
from ethereum_types.bytes import Bytes
3535
from ethereum_types.frozen import slotted_freezable
3636
from ethereum_types.numeric import U256, Uint
@@ -83,7 +83,7 @@ class LeafNode:
8383
"""Leaf node in the Merkle Trie"""
8484

8585
rest_of_key: Bytes
86-
value: rlp.Extended
86+
value: Extended
8787

8888

8989
@slotted_freezable
@@ -92,26 +92,26 @@ class ExtensionNode:
9292
"""Extension node in the Merkle Trie"""
9393

9494
key_segment: Bytes
95-
subnode: rlp.Extended
95+
subnode: Extended
9696

9797

9898
BranchSubnodes = Tuple[
99-
rlp.Extended,
100-
rlp.Extended,
101-
rlp.Extended,
102-
rlp.Extended,
103-
rlp.Extended,
104-
rlp.Extended,
105-
rlp.Extended,
106-
rlp.Extended,
107-
rlp.Extended,
108-
rlp.Extended,
109-
rlp.Extended,
110-
rlp.Extended,
111-
rlp.Extended,
112-
rlp.Extended,
113-
rlp.Extended,
114-
rlp.Extended,
99+
Extended,
100+
Extended,
101+
Extended,
102+
Extended,
103+
Extended,
104+
Extended,
105+
Extended,
106+
Extended,
107+
Extended,
108+
Extended,
109+
Extended,
110+
Extended,
111+
Extended,
112+
Extended,
113+
Extended,
114+
Extended,
115115
]
116116

117117

@@ -121,13 +121,13 @@ class BranchNode:
121121
"""Branch node in the Merkle Trie"""
122122

123123
subnodes: BranchSubnodes
124-
value: rlp.Extended
124+
value: Extended
125125

126126

127127
InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
128128

129129

130-
def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
130+
def encode_internal_node(node: Optional[InternalNode]) -> Extended:
131131
"""
132132
Encodes a Merkle Trie node into its RLP form. The RLP will then be
133133
serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -146,7 +146,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
146146
encoded : `rlp.RLP`
147147
The node encoded as RLP.
148148
"""
149-
unencoded: rlp.Extended
149+
unencoded: Extended
150150
if node is None:
151151
unencoded = b""
152152
elif isinstance(node, LeafNode):
@@ -486,6 +486,6 @@ def patricialize(
486486
for k in range(16)
487487
)
488488
return BranchNode(
489-
cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
489+
cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
490490
value,
491491
)

‎src/ethereum/cancun/trie.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
cast,
3131
)
3232

33-
from ethereum_rlp import rlp
33+
from ethereum_rlp import Extended, rlp
3434
from ethereum_types.bytes import Bytes
3535
from ethereum_types.frozen import slotted_freezable
3636
from ethereum_types.numeric import U256, Uint
@@ -86,7 +86,7 @@ class LeafNode:
8686
"""Leaf node in the Merkle Trie"""
8787

8888
rest_of_key: Bytes
89-
value: rlp.Extended
89+
value: Extended
9090

9191

9292
@slotted_freezable
@@ -95,26 +95,26 @@ class ExtensionNode:
9595
"""Extension node in the Merkle Trie"""
9696

9797
key_segment: Bytes
98-
subnode: rlp.Extended
98+
subnode: Extended
9999

100100

101101
BranchSubnodes = Tuple[
102-
rlp.Extended,
103-
rlp.Extended,
104-
rlp.Extended,
105-
rlp.Extended,
106-
rlp.Extended,
107-
rlp.Extended,
108-
rlp.Extended,
109-
rlp.Extended,
110-
rlp.Extended,
111-
rlp.Extended,
112-
rlp.Extended,
113-
rlp.Extended,
114-
rlp.Extended,
115-
rlp.Extended,
116-
rlp.Extended,
117-
rlp.Extended,
102+
Extended,
103+
Extended,
104+
Extended,
105+
Extended,
106+
Extended,
107+
Extended,
108+
Extended,
109+
Extended,
110+
Extended,
111+
Extended,
112+
Extended,
113+
Extended,
114+
Extended,
115+
Extended,
116+
Extended,
117+
Extended,
118118
]
119119

120120

@@ -124,13 +124,13 @@ class BranchNode:
124124
"""Branch node in the Merkle Trie"""
125125

126126
subnodes: BranchSubnodes
127-
value: rlp.Extended
127+
value: Extended
128128

129129

130130
InternalNode = Union[LeafNode, ExtensionNode, BranchNode]
131131

132132

133-
def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
133+
def encode_internal_node(node: Optional[InternalNode]) -> Extended:
134134
"""
135135
Encodes a Merkle Trie node into its RLP form. The RLP will then be
136136
serialized into a `Bytes` and hashed unless it is less that 32 bytes
@@ -146,10 +146,10 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
146146
147147
Returns
148148
-------
149-
encoded : `rlp.Extended`
149+
encoded : `Extended`
150150
The node encoded as RLP.
151151
"""
152-
unencoded: rlp.Extended
152+
unencoded: Extended
153153
if node is None:
154154
unencoded = b""
155155
elif isinstance(node, LeafNode):
@@ -489,6 +489,6 @@ def patricialize(
489489
for k in range(16)
490490
)
491491
return BranchNode(
492-
cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
492+
cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
493493
value,
494494
)

0 commit comments

Comments
 (0)