Skip to content

Commit cec7dd8

Browse files
committed
Make test more DRY
1 parent 935b73c commit cec7dd8

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

tests/core/tester/test_generate_vm_configuration.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010

1111
class Forks(enum.Enum):
12-
Custom = -1
13-
Frontier = 0
14-
Homestead = 1
15-
TangerineWhistle = 2
16-
SpuriousDragon = 3
17-
Byzantium = 4
18-
Constantinople = 5
19-
Petersburg = 6
12+
Custom = 'CustomFrontier'
13+
Frontier = 'Frontier'
14+
Homestead = 'Homestead'
15+
TangerineWhistle = 'TangerineWhistle'
16+
SpuriousDragon = 'SpuriousDragon'
17+
Byzantium = 'Byzantium'
18+
Constantinople = 'Constantinople'
19+
Petersburg = 'Petersburg'
2020

2121

2222
class CustomFrontierVM(FrontierVM):
@@ -139,9 +139,9 @@ def test_generate_vm_configuration(args, kwargs, expected):
139139

140140
assert left_block == right_block
141141

142-
if right_vm == Forks.Frontier:
143-
assert 'Frontier' in left_vm.__name__
144-
elif right_vm == Forks.Homestead:
142+
assert right_vm.value in left_vm.__name__
143+
144+
if right_vm == Forks.Homestead:
145145
assert 'Homestead' in left_vm.__name__
146146
dao_start_block = kwargs.get('dao_start_block')
147147
if dao_start_block is False:
@@ -152,17 +152,3 @@ def test_generate_vm_configuration(args, kwargs, expected):
152152
else:
153153
assert left_vm.support_dao_fork is True
154154
assert left_vm.get_dao_fork_block_number() == dao_start_block
155-
elif right_vm == Forks.TangerineWhistle:
156-
assert 'TangerineWhistle' in left_vm.__name__
157-
elif right_vm == Forks.SpuriousDragon:
158-
assert 'SpuriousDragon' in left_vm.__name__
159-
elif right_vm == Forks.Byzantium:
160-
assert 'Byzantium' in left_vm.__name__
161-
elif right_vm == Forks.Constantinople:
162-
assert 'Constantinople' in left_vm.__name__
163-
elif right_vm == Forks.Petersburg:
164-
assert 'Petersburg' in left_vm.__name__
165-
elif right_vm == Forks.Custom:
166-
assert 'CustomFrontier' in left_vm.__name__
167-
else:
168-
assert False, "Invariant"

0 commit comments

Comments
 (0)