check for all possible invalid opcodes.

3 files changed, 44 insertions, 148 deletions

diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json
deleted file mode 100644
index 5d1f45be2..000000000
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSIZEFiller.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "badOpcodeSSIZE" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : ["ALL"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "code" : "0x6001600155e36001600255",
-                        "storage" : {
-                            "0x01" : "0x01"
-                        }
-                    }
-                }
-            }
-        ],
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x6001600155e36001600255",
-                "nonce" : "0",
-                "storage" : {
-                  "0x01": "0x01"
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
-                "code": "0x",
-                "nonce": "0",
-                "storage": {
-
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                ""
-            ],
-            "gasLimit" : [
-                "400000"
-            ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : [
-                "100000"
-            ]
-        }
-    }
-}
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSTOREBYTESFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSTOREBYTESFiller.json
deleted file mode 100644
index 74153c952..000000000
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSSTOREBYTESFiller.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "badOpcodeSSTOREBYTES" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : ["ALL"],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "//comment1": "SSTOREBYTES: key, mstart, msize",
-                        "//comment2" : "0x 6001 6000 6001 e2 6001 6002 55",
-                        "code": "0x600160006001e26001600255",
-                        "storage" : {
-                            "0x01" : "0x01"
-                        }
-                    }
-                }
-            }
-        ],
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x600160006001e26001600255",
-                "nonce" : "0",
-                "storage" : {
-                  "0x01": "0x01"
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
-                "code": "0x",
-                "nonce": "0",
-                "storage": {
-
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                ""
-            ],
-            "gasLimit" : [
-                "400000"
-            ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : [
-                "100000"
-            ]
-        }
-    }
-}
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
index 1a8cab1a6..79bcf2e0f 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodeSLOADBYTESFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
@@ -1,5 +1,5 @@
 {
-    "badOpcodeSLOADBYTES" : {
+    "badOpcodes" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -13,42 +13,66 @@
                 "indexes" : {
                     "data" : -1,
                     "gas" : 0,
-                    "value" : -1
+                    "value" : 0
                 },
                 "network" : ["ALL"],
                 "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "//comment1": "SLOADBYTES: key, mstart, msize",
-                        "//comment2" : "0x 6001 6000 6001 e1 6001 6002 55",
-                        "code": "0x600160006001e16001600255",
-                        "storage" : {
-                            "0x01" : "0x01"
-                        }
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "shouldnotexist": 1
                     }
                 }
             }
         ],
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x600160006001e16001600255",
-                "nonce" : "0",
-                "storage" : {
-                  "0x01": "0x01"
-                }
-            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000000000000000000",
                 "code": "0x",
                 "nonce": "0",
                 "storage": {
-
                 }
             }
         },
         "transaction" : {
             "data" : [
-                ""
+		"0x60016001600160010c",
+		"0x60016001600160010d",
+		"0x60016001600160010e",
+		"0x60016001600160010f",
+		"0x60016001600160011b",
+		"0x60016001600160011c",
+		"0x60016001600160011d",
+		"0x60016001600160011e",
+		"0x60016001600160011f",
+		"0x600160016001600121",
+		"0x600160016001600122",
+		"0x600160016001600123",
+		"0x600160016001600124",
+		"0x600160016001600125",
+		"0x600160016001600126",
+		"0x600160016001600127",
+		"0x600160016001600128",
+		"0x600160016001600129",
+		"0x60016001600160012a",
+		"0x60016001600160012b",
+		"0x60016001600160012c",
+		"0x60016001600160012d",
+		"0x60016001600160012e",
+		"0x60016001600160012f",
+		"0x60016001600160013f",
+		"0x600160016001600146",
+		"0x600160016001600147",
+		"0x600160016001600148",
+		"0x600160016001600149",
+		"0x60016001600160014a",
+		"0x60016001600160014b",
+		"0x60016001600160014c",
+		"0x60016001600160014d",
+		"0x60016001600160014e",
+		"0x60016001600160014f",
+		"0x60016001600160015c",
+		"0x60016001600160015d",
+		"0x60016001600160015e",
+		"0x60016001600160015f"
             ],
             "gasLimit" : [
                 "400000"
@@ -56,7 +80,7 @@
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "to" : "",
             "value" : [
                 "100000"
             ]