Use '>=Constantinople' instead of '>Byzantium' to be a bit more readable that this feature is new in Constantinople.

Remove <=Byzantium cases that are only checking that EXTCODEHASH is not supported.

6 files changed, 10 insertions, 83 deletions

diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json b/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
index 31f3da013..14e160987 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashDynamicArgument.json
@@ -5,7 +5,7 @@
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json",
-            "sourceHash" : "a5964baf916ec15a0e3ffa1493619be6f63353ce13c1009d7eb4125ed55f4501"
+            "sourceHash" : "c0fa27ac6de0519b0e715e14ab8e17929c52cb38fb761a29e058046c896a7ab4"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashSelf.json b/GeneralStateTests/stExtCodeHash/extCodeHashSelf.json
index f6b0a29fd..9b7012a2c 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashSelf.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashSelf.json
@@ -5,7 +5,7 @@
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json",
-            "sourceHash" : "6f8936f6732cbdf55ba1febcb101219015fd9432992545cdaff04df7697948b4"
+            "sourceHash" : "921198813f2341ae3e9d7ef6d9aa7b3da65bc9941a3b1baf4fe56f700f6cd762"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -16,17 +16,6 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "Byzantium" : [
-                {
-                    "hash" : "0xd3e539dea7d810d48422f5ab25f48a79c05982907bf9f73b8efbee42c19531b1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Constantinople" : [
                 {
                     "hash" : "0xf4d9afb014cddaab6c38911576da8445ad61aa19ccfd9cc8255bf3f99de7950e",
@@ -37,50 +26,6 @@
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
-            ],
-            "EIP150" : [
-                {
-                    "hash" : "0xd3e539dea7d810d48422f5ab25f48a79c05982907bf9f73b8efbee42c19531b1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xd3e539dea7d810d48422f5ab25f48a79c05982907bf9f73b8efbee42c19531b1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xd3e539dea7d810d48422f5ab25f48a79c05982907bf9f73b8efbee42c19531b1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xd3e539dea7d810d48422f5ab25f48a79c05982907bf9f73b8efbee42c19531b1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
             ]
         },
         "pre" : {
diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit.json b/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit.json
index 506c6f021..b6fde6a15 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashSelfInInit.json
@@ -5,7 +5,7 @@
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json",
-            "sourceHash" : "a17e4fb7a0a4a6ac92dc1b2b696f92340f5ff3e7b85320b8157ec8265c087c8b"
+            "sourceHash" : "e37b28aa1c79131346753c731cb6bdd751522a18203fbe3913944da972b3ce96"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
index adb71f04a..8c1c7948e 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDynamicArgumentFiller.json
@@ -19,7 +19,7 @@
                     "value": 0
                 },
                 "network": [
-                    ">Byzantium"
+                    ">=Constantinople"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
@@ -38,7 +38,7 @@
                     "value": 0
                 },
                 "network": [
-                    ">Byzantium"
+                    ">=Constantinople"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
@@ -57,7 +57,7 @@
                     "value": 0
                 },
                 "network": [
-                    ">Byzantium"
+                    ">=Constantinople"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
@@ -76,7 +76,7 @@
                     "value": 0
                 },
                 "network": [
-                    ">Byzantium"
+                    ">=Constantinople"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
@@ -95,7 +95,7 @@
                     "value": 0
                 },
                 "network": [
-                    ">Byzantium"
+                    ">=Constantinople"
                 ],
                 "result": {
                     "deadbeef00000000000000000000000000000000": {
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json
index ba3433521..a35198174 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfFiller.json
@@ -19,7 +19,7 @@
           "value": -1
         },
         "network": [
-          ">Byzantium"
+          ">=Constantinople"
         ],
         "result": {
           "deadbeef00000000000000000000000000000000": {
@@ -30,24 +30,6 @@
             }
           }
         }
-      },
-      {
-        "indexes": {
-          "data": -1,
-          "gas": -1,
-          "value": -1
-        },
-        "network": [
-          "<=Byzantium"
-        ],
-        "result": {
-          "deadbeef00000000000000000000000000000000": {
-            "balance": "1000000000000000000",
-            "storage": {
-              "0x00": "0xdeadbeef"
-            }
-          }
-        }
       }
     ],
     "pre": {
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json
index 45c5debd3..5d7b9cb89 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSelfInInitFiller.json
@@ -19,7 +19,7 @@
           "value": -1
         },
         "network": [
-          ">Byzantium"
+          ">=Constantinople"
         ],
         "result": {
           "deadbeef00000000000000000000000000000000": {