fix(ci): Clean during coverage script (ethereum#1610)

* fix(ci): Clean during coverage script

* fix

Author: marioevz

.github/workflows/coverage.yaml

@@ -172,35 +172,32 @@ jobs:
           source $GITHUB_ENV
           files=$(echo "$CHANGED_TEST_FILES" | tr ',' '\n')
 
-          mkdir -p fixtures/state_tests
-          mkdir -p fixtures/eof_tests
-          mkdir -p fixtures/blockchain_tests
+          # Include basic evm operations into coverage by default
+          # As when we translate from yul/solidity some dup/push opcodes could become untouched
+          files="$files tests/homestead/coverage/test_coverage.py"
 
-          echo "uv run fill $files --until=Cancun --evm-bin evmone-t8n >> filloutput.log 2>&1"
-          uv run fill $files --until=Cancun --evm-bin evmone-t8n > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
+          echo "uv run fill $files --clean --until=Cancun --evm-bin evmone-t8n >> filloutput.log 2>&1"
+          uv run fill $files --clean --until=Cancun --evm-bin evmone-t8n > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
 
           if grep -q "FAILURES" filloutput.log; then
               echo "Error: failed to generate .py tests."
               exit 1
           fi
 
+          mkdir -p fixtures/blockchain_tests
+          mkdir -p fixtures/state_tests
           filesBlock=$(find fixtures/blockchain_tests -type f -name "*.json")
           filesState=$(find fixtures/state_tests -type f -name "*.json")
-          filesEOF=$(find fixtures/eof_tests -type f -name "*.json")
-          if [ -z "$filesState" ] && [ -z "$filesEOF" ] && [ -z "$filesBlock" ]; then
+          if [ -z "$filesState" ] && [ -z "$filesBlock" ]; then
               echo "Error: No supported filled JSON files found in fixtures."
               exit 1
           fi
 
-          # Include basic evm operations into coverage by default
-          # As when we translate from yul/solidity some dup/push opcodes could become untouched
-          uv run fill tests/homestead/coverage/test_coverage.py --until=Cancun --evm-bin evmone-t8n
 
           PATCH_TEST_PATH=${{ github.workspace }}/evmtest_coverage/coverage/PATCH_TESTS
           mkdir -p $PATCH_TEST_PATH
           find fixtures/blockchain_tests -type f -name "*.json" -exec bash -c 'cp "$0" "$1/blockchain_$(basename "$0")"' {} "$PATCH_TEST_PATH" \;
           find fixtures/state_tests -type f -name "*.json" -exec cp {} $PATCH_TEST_PATH \;
-          find fixtures/eof_tests -type f -name "*.json" -exec cp {} $PATCH_TEST_PATH \;
 
       - name: Parse and fill introduced test sources from before the PR
         if: ${{ steps.changed-tests.outputs.tests_any_changed == 'true' && env.converted_skip == 'true' }}
@@ -229,13 +226,10 @@ jobs:
 
           rm -r fixtures
           rm filloutput.log
-          mkdir -p fixtures/blockchain_tests
-          mkdir -p fixtures/state_tests
-          mkdir -p fixtures/eof_tests
 
           if [ -n "$files_fixed" ]; then
-              echo "uv run fill $files_fixed --until=Cancun --evm-bin evmone-t8n >> filloutput.log 2>&1"
-              uv run fill $files_fixed --until=Cancun --evm-bin evmone-t8n > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
+              echo "uv run fill $files_fixed --clean --until=Cancun --evm-bin evmone-t8n >> filloutput.log 2>&1"
+              uv run fill $files_fixed --clean --until=Cancun --evm-bin evmone-t8n > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
 
               if grep -q "FAILURES" filloutput.log; then
                 echo "Error: failed to generate .py tests from before the PR."
@@ -250,16 +244,16 @@ jobs:
               echo "No tests affected from before the patch!"
           fi
 
+          mkdir -p fixtures/blockchain_tests
+          mkdir -p fixtures/state_tests
           filesBlock=$(find fixtures/blockchain_tests -type f -name "*.json")
           filesState=$(find fixtures/state_tests -type f -name "*.json")
-          filesEOF=$(find fixtures/eof_tests -type f -name "*.json")
 
           BASE_TEST_PATH=${{ github.workspace }}/evmtest_coverage/coverage/BASE_TESTS
           mkdir -p $BASE_TEST_PATH
 
           find fixtures/blockchain_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
           find fixtures/state_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
-          find fixtures/eof_tests -type f -name "*.json" -exec cp {} $BASE_TEST_PATH \;
           for file in $BASE_TEST_PATH/*.json; do
               if [ -e "$file" ]; then
                   mv "$file" "${file%.json}_$PREV_COMMIT.json"