update general tests

1 files changed, 239 insertions, 50 deletions

diff --git a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json
index 154a3bc65..cdfa31223 100644
--- a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json
+++ b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit.json
@@ -6,69 +6,258 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                        "shouldnotexist" : "1"
-                    },
-                    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0",
-                        "storage" : {
-                            "0x01" : "0x00"
-                        }
-                    }
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xba5ae1e3e6d8442c50bf29604d4d96457d6b48419f056da87878e3cc83569129",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x5f371bb123b53255249203a7c7e2ffc5c3ae27f3e8816f53e02188c9f42f5ff1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa729e7decd16eb178dda568c3f383213df1d5316c4ca5b95d7512c391a10b094",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa729e7decd16eb178dda568c3f383213df1d5316c4ca5b95d7512c391a10b094",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xa729e7decd16eb178dda568c3f383213df1d5316c4ca5b95d7512c391a10b094",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "11",
-                "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0b",
+                "code" : "0x5b61c35060805110156018576001608051016080526000565b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ (MSTORE 1 1) }",
-                "nonce" : "0",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6001600152",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "11",
-                "code" : "{ (SSTORE 1 1) }",
-                "nonce" : "0",
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0b",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "11",
-                "code" : "{ (CALL 100 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) }",
-                "nonce" : "0",
+            "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0b",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6064f1",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -81,14 +270,14 @@
                 "0x600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }