Skip to content

Commit ca18ab1

Browse files
authored
fix(spec-tests): fix title->module conversion for bpo forks (#1894)
1 parent 06b2807 commit ca18ab1

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

src/ethereum/forks/bpo1/utils/hexadecimal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
------------
1010
1111
Hexadecimal utility functions used in this specification, specific to
12-
Bpo1 types.
12+
BPO1 types.
1313
"""
1414

1515
from ethereum_types.bytes import Bytes

src/ethereum_spec_tools/evm_tools/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ def find_fork(
128128
current_fork_module = fork
129129
current_fork_block = fork_block
130130

131+
current_fork_module = re.sub("^b_p_o", "bpo", current_fork_module)
132+
131133
for fork in forks:
132134
if current_fork_module == fork.short_name:
133135
return fork, current_fork_block

src/ethereum_spec_tools/forks.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ def title_case_name(self) -> str:
360360
"""
361361
Name of the hard fork.
362362
"""
363+
if self.short_name.startswith("bpo"):
364+
return "BPO" + self.short_name[3:].replace("_", " ")
365+
363366
return self.short_name.replace("_", " ").title()
364367

365368
def __repr__(self) -> str:

src/ethereum_spec_tools/new_fork/builder.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,22 @@ class ReplaceForkName(CodemodArgs):
214214
def _to_args(
215215
self, fork_builder: "ForkBuilder", working_directory: Path
216216
) -> list[list[str]]:
217+
new_fork_title_case = fork_builder.new_fork.removeprefix("bpo")
218+
if new_fork_title_case == fork_builder.new_fork:
219+
new_fork_title_case = fork_builder.new_fork.replace(
220+
"_", " "
221+
).title()
222+
else:
223+
new_fork_title_case = "BPO" + new_fork_title_case
224+
217225
common = [
218226
str(working_directory),
219227
"--replace",
220228
fork_builder.template_fork.short_name,
221229
fork_builder.new_fork,
222230
"--replace",
223231
fork_builder.template_fork.title_case_name,
224-
fork_builder.new_fork.replace("_", " ").title(),
232+
new_fork_title_case,
225233
"--replace",
226234
fork_builder.template_fork.title_case_name.lower(),
227235
fork_builder.new_fork.replace("_", " ").lower(),

0 commit comments

Comments
 (0)