update general tests

1 files changed, 126 insertions, 72 deletions

diff --git a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
index 1f3dd42a9..31cb14b6a 100644
--- a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
+++ b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
@@ -6,76 +6,130 @@
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : 0,
-                    "gas" : -1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x0a" : "0x01",
-                            "0x0b" : "0x01",
-                            "0x16" : "0x984376",
-                            "0x17" : "0x96bc55"
-                        }
+                {
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "70695"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "9929305",
-                        "nonce" : "1"
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : 1,
-                    "gas" : -1,
-                    "value" : -1
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x0a" : "0x01",
-                            "0x0b" : "0x01",
-                            "0x16" : "0x9843b6",
-                            "0x17" : "0x96a679"
-                        }
+                {
+                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "73493"
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "9926507",
-                        "nonce" : "1"
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
-                "nonce" : "0",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
                     "0x02" : "0x01",
@@ -87,17 +141,17 @@
                     "0x08" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "10000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x989680",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "1000000000000000000",
-                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
-                "nonce" : "0",
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -108,14 +162,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }