test: Recognize all official fork/revision names

This adds "Paris" and "Petersburg" to the names recognized by
the testing utils.

Author: chfast

circle.yml

@@ -463,7 +463,7 @@ jobs:
           branch: evmc-v11.0.0-alpha.1
           commit: evmc-v11.0.0-alpha.1
       - download_execution_tests:
-          rev: v13
+          rev: v13.1
       - run:
           name: "Silkworm-driven blockchain tests (Advanced)"
           working_directory: ~/build
@@ -500,7 +500,7 @@ jobs:
             bin/evmone-statetest ~/spec-tests/fixtures/state_tests
 
       - download_execution_tests:
-          rev: v13
+          rev: v13.1
       - run:
           name: "State tests"
           working_directory: ~/build

test/utils/utils.cpp

@@ -21,18 +21,16 @@ evmc_revision to_rev(std::string_view s)
         return EVMC_BYZANTIUM;
     if (s == "Constantinople")
         return EVMC_CONSTANTINOPLE;
-    if (s == "ConstantinopleFix")
+    if (s == "Petersburg" || s == "ConstantinopleFix")
         return EVMC_PETERSBURG;
     if (s == "Istanbul")
         return EVMC_ISTANBUL;
     if (s == "Berlin")
         return EVMC_BERLIN;
     if (s == "London" || s == "ArrowGlacier")
         return EVMC_LONDON;
-    if (s == "Merge")
+    if (s == "Paris" || s == "Merge")
         return EVMC_PARIS;
-    if (s == "Merge+3855")  // PUSH0
-        return EVMC_SHANGHAI;
     if (s == "Shanghai")
         return EVMC_SHANGHAI;
     if (s == "Cancun")