@@ -104,44 +104,6 @@ def scenarios(fork: Fork, pre: Alloc, test_program: ScenarioTestProgram) -> List
104
104
return scenarios_list
105
105
106
106
107
- program_classes = [
108
- ProgramSstoreSload (),
109
- ProgramTstoreTload (),
110
- ProgramLogs (),
111
- ProgramSuicide (),
112
- ProgramInvalidOpcode (),
113
- ProgramAddress (),
114
- ProgramBalance (),
115
- ProgramOrigin (),
116
- ProgramCaller (),
117
- ProgramCallValue (),
118
- ProgramCallDataLoad (),
119
- ProgramCallDataSize (),
120
- ProgramCallDataCopy (),
121
- ProgramCodeCopyCodeSize (),
122
- ProgramGasPrice (),
123
- ProgramExtCodeCopyExtCodeSize (),
124
- ProgramReturnDataSize (),
125
- ProgramReturnDataCopy (),
126
- ProgramExtCodehash (),
127
- ProgramBlockhash (),
128
- ProgramCoinbase (),
129
- ProgramTimestamp (),
130
- ProgramNumber (),
131
- ProgramDifficultyRandao (),
132
- ProgramGasLimit (),
133
- ProgramChainid (),
134
- ProgramSelfbalance (),
135
- ProgramBasefee (),
136
- ProgramBlobhash (),
137
- ProgramBlobBaseFee (),
138
- ProgramTload (),
139
- ProgramMcopy (),
140
- ProgramPush0 (),
141
- ProgramAllFrontierOpcodes (),
142
- ]
143
-
144
-
145
107
@pytest .mark .ported_from (
146
108
[
147
109
"https://github.com/ethereum/tests/blob/v13.3/src/Templates/DiffPlaces/templateGen.js" ,
@@ -151,6 +113,7 @@ def scenarios(fork: Fork, pre: Alloc, test_program: ScenarioTestProgram) -> List
151
113
"https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stSelfBalance/diffPlacesFiller.yml" ,
152
114
],
153
115
pr = ["https://github.com/ethereum/execution-spec-tests/pull/808" ],
116
+ coverage_missed_reason = ("Original test pre-sets storage of some of the deployed accounts." ),
154
117
)
155
118
@pytest .mark .valid_from ("Frontier" )
156
119
@pytest .mark .parametrize (
@@ -169,8 +132,42 @@ def scenarios(fork: Fork, pre: Alloc, test_program: ScenarioTestProgram) -> List
169
132
)
170
133
@pytest .mark .parametrize (
171
134
"test_program" ,
172
- program_classes ,
173
- ids = [cls .id for cls in program_classes ],
135
+ [
136
+ ProgramSstoreSload (),
137
+ ProgramTstoreTload (),
138
+ ProgramLogs (),
139
+ ProgramSuicide (),
140
+ pytest .param (ProgramInvalidOpcode (), marks = [pytest .mark .slow ()]),
141
+ ProgramAddress (),
142
+ ProgramBalance (),
143
+ ProgramOrigin (),
144
+ ProgramCaller (),
145
+ ProgramCallValue (),
146
+ ProgramCallDataLoad (),
147
+ ProgramCallDataSize (),
148
+ ProgramCallDataCopy (),
149
+ ProgramCodeCopyCodeSize (),
150
+ ProgramGasPrice (),
151
+ ProgramExtCodeCopyExtCodeSize (),
152
+ ProgramReturnDataSize (),
153
+ ProgramReturnDataCopy (),
154
+ ProgramExtCodehash (),
155
+ pytest .param (ProgramBlockhash (), marks = [pytest .mark .slow ()]),
156
+ ProgramCoinbase (),
157
+ ProgramTimestamp (),
158
+ ProgramNumber (),
159
+ ProgramDifficultyRandao (),
160
+ ProgramGasLimit (),
161
+ ProgramChainid (),
162
+ ProgramSelfbalance (),
163
+ ProgramBasefee (),
164
+ ProgramBlobhash (),
165
+ ProgramBlobBaseFee (),
166
+ ProgramTload (),
167
+ ProgramMcopy (),
168
+ ProgramPush0 (),
169
+ ProgramAllFrontierOpcodes (),
170
+ ],
174
171
)
175
172
def test_scenarios (
176
173
blockchain_test : BlockchainTestFiller ,
0 commit comments