upgrade eip158 to general tests

1 files changed, 36 insertions, 7 deletions

diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
index 099ec3147..6288f712a 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -19,27 +19,56 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x24" : "0x01"
+                            "0x29" : "0x01"
                         }
                     },
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+			"balance" : "47",
                         "storage" : {
                         }
-                    }
+                    },
+		    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+			"shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+			"shouldnotexist" : "1"
+                    },
+		    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+			"balance" : "23",
+                        "storage" : {
+                        }
+		    },
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"nonce" : "1"
+		    }
                 }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0)   }",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (CALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 32 0 0)   }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -54,7 +83,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000186a0", "0x00000000000000000000000000000000000000000000000000000000000486a0"
             ],
             "gasLimit" : [
                 "10000000"
@@ -68,4 +97,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}