@@ -173,10 +173,9 @@ jobs:
173173 source $GITHUB_ENV
174174 files=$(echo "$CHANGED_TEST_FILES" | tr ',' '\n')
175175
176- # fill new tests
177- # using `|| true` here because if no tests found, pyspec fill returns error code
178176 mkdir -p fixtures/state_tests
179177 mkdir -p fixtures/eof_tests
178+ mkdir -p fixtures/blockchain_tests
180179
181180 echo "uv run fill $files --until=Cancun --evm-bin evmone-t8n >> filloutput.log 2>&1"
182181 uv run fill $files --until=Cancun --evm-bin evmone-t8n > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
@@ -186,10 +185,11 @@ jobs:
186185 exit 1
187186 fi
188187
188+ filesBlock=$(find fixtures/blockchain_tests -type f -name "*.json")
189189 filesState=$(find fixtures/state_tests -type f -name "*.json")
190190 filesEOF=$(find fixtures/eof_tests -type f -name "*.json")
191- if [ -z "$filesState" ] && [ -z "$filesEOF" ]; then
192- echo "Error: No filled JSON fixtures found in fixtures."
191+ if [ -z "$filesState" ] && [ -z "$filesEOF" ] && [ -z "$filesBlock" ] ; then
192+ echo "Error: No supported filled JSON files found in fixtures."
193193 exit 1
194194 fi
195195
@@ -199,6 +199,7 @@ jobs:
199199
200200 PATCH_TEST_PATH=${{ github.workspace }}/evmtest_coverage/coverage/PATCH_TESTS
201201 mkdir -p $PATCH_TEST_PATH
202+ find fixtures/blockchain_tests -type f -name "*.json" -exec cp {} $PATCH_TEST_PATH \;
202203 find fixtures/state_tests -type f -name "*.json" -exec cp {} $PATCH_TEST_PATH \;
203204 find fixtures/eof_tests -type f -name "*.json" -exec cp {} $PATCH_TEST_PATH \;
204205
@@ -229,6 +230,7 @@ jobs:
229230
230231 rm -r fixtures
231232 rm filloutput.log
233+ mkdir -p fixtures/blockchain_tests
232234 mkdir -p fixtures/state_tests
233235 mkdir -p fixtures/eof_tests
234236
@@ -246,14 +248,17 @@ jobs:
246248 exit 1
247249 fi
248250 else
249- echo "No tests affected from before patch!"
251+ echo "No tests affected from before the patch!"
250252 fi
251253
254+ filesBlock=$(find fixtures/blockchain_tests -type f -name "*.json")
252255 filesState=$(find fixtures/state_tests -type f -name "*.json")
253256 filesEOF=$(find fixtures/eof_tests -type f -name "*.json")
254257
255258 BASE_TEST_PATH=${{ github.workspace }}/evmtest_coverage/coverage/BASE_TESTS
256259 mkdir -p $BASE_TEST_PATH
260+
261+ find fixtures/blockchain_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
257262 find fixtures/state_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
258263 find fixtures/eof_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
259264 for file in $BASE_TEST_PATH/*.json; do
0 commit comments