Merge pull request #277 from ethereum/badOpcodes-CALLBLACKBOX

Add more opcodes to badOpcodes test

1 files changed, 138 insertions, 43 deletions

diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
index 79bcf2e0f..fdbef92c6 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
@@ -9,19 +9,31 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
-            {
+						{
                 "indexes" : {
-                    "data" : -1,
+                    "data" : [0],
                     "gas" : 0,
                     "value" : 0
                 },
                 "network" : ["ALL"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                        "shouldnotexist": 1
+										}
+                }
+						},
+						{
+                "indexes" : {
+                    "data" : [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171],
+                    "gas" : 0,
+                    "value" : 0
+                },
+                "network" : ["ALL"],
+                "result" : {
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+											"shouldnotexist": "1"
                     }
                 }
-            }
+						}
         ],
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -34,45 +46,128 @@
         },
         "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"
+"0x60016001600160014000006000f3",
+"0x60016001600160010c60006000f3",
+"0x60016001600160010d60006000f3",
+"0x60016001600160010e60006000f3",
+"0x60016001600160010f60006000f3",
+"0x60016001600160011b60006000f3",
+"0x60016001600160011c60006000f3",
+"0x60016001600160011d60006000f3",
+"0x60016001600160011e60006000f3",
+"0x60016001600160011f60006000f3",
+"0x60016001600160012160006000f3",
+"0x60016001600160012260006000f3",
+"0x60016001600160012360006000f3",
+"0x60016001600160012460006000f3",
+"0x60016001600160012560006000f3",
+"0x60016001600160012660006000f3",
+"0x60016001600160012760006000f3",
+"0x60016001600160012860006000f3",
+"0x60016001600160012960006000f3",
+"0x60016001600160012a60006000f3",
+"0x60016001600160012b60006000f3",
+"0x60016001600160012c60006000f3",
+"0x60016001600160012d60006000f3",
+"0x60016001600160012e60006000f3",
+"0x60016001600160012f60006000f3",
+"0x60016001600160013f60006000f3",
+"0x60016001600160014660006000f3",
+"0x60016001600160014760006000f3",
+"0x60016001600160014860006000f3",
+"0x60016001600160014960006000f3",
+"0x60016001600160014a60006000f3",
+"0x60016001600160014b60006000f3",
+"0x60016001600160014c60006000f3",
+"0x60016001600160014d60006000f3",
+"0x60016001600160014e60006000f3",
+"0x60016001600160014f60006000f3",
+"0x60016001600160015c60006000f3",
+"0x60016001600160015d60006000f3",
+"0x60016001600160015e60006000f3",
+"0x60016001600160015f60006000f3",
+"0x6001600160016001a560006000f3",
+"0x6001600160016001a660006000f3",
+"0x6001600160016001a760006000f3",
+"0x6001600160016001a860006000f3",
+"0x6001600160016001a960006000f3",
+"0x6001600160016001aa60006000f3",
+"0x6001600160016001ab60006000f3",
+"0x6001600160016001ac60006000f3",
+"0x6001600160016001ad60006000f3",
+"0x6001600160016001ae60006000f3",
+"0x6001600160016001af60006000f3",
+"0x6001600160016001b060006000f3",
+"0x6001600160016001b160006000f3",
+"0x6001600160016001b260006000f3",
+"0x6001600160016001b360006000f3",
+"0x6001600160016001b460006000f3",
+"0x6001600160016001b560006000f3",
+"0x6001600160016001b660006000f3",
+"0x6001600160016001b760006000f3",
+"0x6001600160016001b860006000f3",
+"0x6001600160016001b960006000f3",
+"0x6001600160016001ba60006000f3",
+"0x6001600160016001bb60006000f3",
+"0x6001600160016001bc60006000f3",
+"0x6001600160016001bd60006000f3",
+"0x6001600160016001be60006000f3",
+"0x6001600160016001bf60006000f3",
+"0x6001600160016001c060006000f3",
+"0x6001600160016001c160006000f3",
+"0x6001600160016001c260006000f3",
+"0x6001600160016001c360006000f3",
+"0x6001600160016001c460006000f3",
+"0x6001600160016001c560006000f3",
+"0x6001600160016001c660006000f3",
+"0x6001600160016001c760006000f3",
+"0x6001600160016001c860006000f3",
+"0x6001600160016001c960006000f3",
+"0x6001600160016001ca60006000f3",
+"0x6001600160016001cb60006000f3",
+"0x6001600160016001cc60006000f3",
+"0x6001600160016001cd60006000f3",
+"0x6001600160016001ce60006000f3",
+"0x6001600160016001cf60006000f3",
+"0x6001600160016001d060006000f3",
+"0x6001600160016001d160006000f3",
+"0x6001600160016001d260006000f3",
+"0x6001600160016001d360006000f3",
+"0x6001600160016001d460006000f3",
+"0x6001600160016001d560006000f3",
+"0x6001600160016001d660006000f3",
+"0x6001600160016001d760006000f3",
+"0x6001600160016001d860006000f3",
+"0x6001600160016001d960006000f3",
+"0x6001600160016001da60006000f3",
+"0x6001600160016001db60006000f3",
+"0x6001600160016001dc60006000f3",
+"0x6001600160016001dd60006000f3",
+"0x6001600160016001de60006000f3",
+"0x6001600160016001df60006000f3",
+"0x6001600160016001e060006000f3",
+"0x6001600160016001e160006000f3",
+"0x6001600160016001e260006000f3",
+"0x6001600160016001e360006000f3",
+"0x6001600160016001e460006000f3",
+"0x6001600160016001e560006000f3",
+"0x6001600160016001e660006000f3",
+"0x6001600160016001e760006000f3",
+"0x6001600160016001e860006000f3",
+"0x6001600160016001e960006000f3",
+"0x6001600160016001ea60006000f3",
+"0x6001600160016001eb60006000f3",
+"0x6001600160016001ec60006000f3",
+"0x6001600160016001ed60006000f3",
+"0x6001600160016001ee60006000f3",
+"0x6001600160016001ef60006000f3",
+"0x6001600160016001f560006000f3",
+"0x6001600160016001f660006000f3",
+"0x6001600160016001f760006000f3",
+"0x6001600160016001f860006000f3",
+"0x6001600160016001f960006000f3",
+"0x6001600160016001fc60006000f3",
+"0x6001600160016001fe60006000f3"
             ],
             "gasLimit" : [
                 "400000"