converted files, no coverage lost

ethereum · Jul 23, 2024 · 0956b63 · 0956b63
1 parent 6ce0990
commit 0956b63
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 23 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -33,15 +33,24 @@ jobs:
           # Eliminate git diff lines, select only .py paths
           echo "Detected changed/new files:"
           py_files=()
-          for file in "${files[@]}"; do
-              file_fixed=$(echo "$file" | cut -c 3-)
+          while read -r line; do
+              file_fixed=$(echo "$line" | cut -c 3-)
               py_files+=("$file_fixed")
-              echo $file_fixed
-          done
+              echo "$file_fixed"
+          done <<< "$files"
 
+          echo "Prepare the NEW_TESTS variable"
           py_files_str=$(IFS=,; echo "${py_files[*]}")
           echo "NEW_TESTS=$py_files_str" >> $GITHUB_ENV
 
+          source $GITHUB_ENV
+          echo $NEW_TESTS
+          files2=$(echo "$NEW_TESTS" | tr ',' '\n')
+          while IFS= read -r file; do
+            echo "Deserialized: $file"
+          done <<< "$files2"
+
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
@@ -213,6 +222,7 @@ jobs:
             mkdir -p fixtures/state_tests
             mkdir -p fixtures/eof_tests
 
+            # Use a while loop with a here-string to avoid subshell issues
             while IFS= read -r file; do
              echo "Fill: $file"
               fill "$file" --until=Cancun --evm-bin evmone-t8n || true >> filloutput.log 2>&1

diff --git a/converted-ethereum-tests.txt b/converted-ethereum-tests.txt
@@ -3,21 +3,21 @@ EOFTests/efValidation/EOF1_returncontract_invalid_.json
 EOFTests/efValidation/EOF1_returncontract_valid_.json
 
 ([#440](https://github.com/ethereum/execution-spec-tests/pull/440))
-GeneralStateTests/Cancun/stEIP1153-transientStorage/01_tloadBeginningTxn.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/02_tloadAfterTstore.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/03_tloadAfterStoreIs0.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/04_tloadAfterCall.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/05_tloadReentrancy.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/06_tstoreInReentrancyCall.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/07_tloadAfterReentrancyStore.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/08_revertUndoesTransientStore.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/09_revertUndoesAll.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/01_tloadBeginningTxn.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/02_tloadAfterTstore.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/03_tloadAfterStoreIs0.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/04_tloadAfterCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/05_tloadReentrancy.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/06_tstoreInReentrancyCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/07_tloadAfterReentrancyStore.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/08_revertUndoesTransientStore.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/09_revertUndoesAll.json
 
-GeneralStateTests/Cancun/stEIP1153-transientStorage/11_tstoreDelegateCall.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/12_tloadDelegateCall.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/13_tloadStaticCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/11_tstoreDelegateCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/12_tloadDelegateCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/13_tloadStaticCall.json
 
-GeneralStateTests/Cancun/stEIP1153-transientStorage/16_tloadGas.json
-GeneralStateTests/Cancun/stEIP1153-transientStorage/18_tloadAfterStore.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/16_tloadGas.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/18_tloadAfterStore.json
 
-GeneralStateTests/Cancun/stEIP1153-transientStorage/20_oogUndoesTransientStoreInCall.json
+ GeneralStateTests/Cancun/stEIP1153-transientStorage/20_oogUndoesTransientStoreInCall.json
diff --git a/tests/cancun/eip1153_tstore/test_basic_tload.py b/tests/cancun/eip1153_tstore/test_basic_tload.py
@@ -1,4 +1,5 @@
 """
+touch
 Ethereum Transient Storage EIP Tests
 https://eips.ethereum.org/EIPS/eip-1153
 """

diff --git a/tests/cancun/eip1153_tstore/test_tload_calls.py b/tests/cancun/eip1153_tstore/test_tload_calls.py
@@ -1,4 +1,5 @@
 """
+touch
 Ethereum Transient Storage EIP Tests
 https://eips.ethereum.org/EIPS/eip-1153
 """

diff --git a/tests/cancun/eip1153_tstore/test_tload_reentrancy.py b/tests/cancun/eip1153_tstore/test_tload_reentrancy.py
@@ -1,4 +1,5 @@
 """
+touch
 Ethereum Transient Storage EIP Tests
 https://eips.ethereum.org/EIPS/eip-1153
 """

diff --git a/tests/cancun/eip1153_tstore/test_tstore_reentrancy.py b/tests/cancun/eip1153_tstore/test_tstore_reentrancy.py
@@ -1,4 +1,5 @@
 """
+touch
 Ethereum Transient Storage EIP Tests
 https://eips.ethereum.org/EIPS/eip-1153
 """

diff --git a/tests/homestead/coverage/test_coverage.py b/tests/homestead/coverage/test_coverage.py
@@ -1,5 +1,5 @@
 """
-touch
+touchs
 Tests that address coverage gaps that result from updating `ethereum/tests` into EEST tests.
 """
 
@@ -44,9 +44,6 @@ def test_coverage(
         + Op.PUSH2(0x0102)
         + Op.PUSH3(0x010203)
         + Op.PUSH4(0x01020304)
-        + Op.PUSH5(0x0102030405)
-        + Op.PUSH6(0x010203040506)
-        + Op.PUSH7(0x01020304050607)
         + Op.POP(0x01),
         storage={},
     )