update general tests

1 files changed, 130 insertions, 56 deletions

diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
index 20e49567c..c39a2540c 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
@@ -6,70 +6,144 @@
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "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" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "0000000000000000000000000000000000000001" : {
-                        "balance" : "1",
-                        "storage" : {
-                        }
-                    }
+                {
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "0000000000000000000000000000000000000001" : {
-                        "balance" : "1",
-                        "storage" : {
-                        }
-                    }
+                {
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001ff",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "180000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02bf20",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
-                "code" : "{(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
-                "nonce" : "0",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x600060006000600060016000600035f1506000ff",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -80,14 +154,14 @@
                 "0x000000000000000000000000000000000000000000000000000000000000aaf0"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }