1 files changed, 61 insertions, 45 deletions
diff --git a/GeneralStateTests/stRandom/randomStatetest178.json b/GeneralStateTests/stRandom/randomStatetest178.json
index bfdd556cf..d8c0de0f4 100644
--- a/GeneralStateTests/stRandom/randomStatetest178.json
+++ b/GeneralStateTests/stRandom/randomStatetest178.json
@@ -6,49 +6,13 @@
             "source" : "/src/GeneralStateTestsFiller/stRandom/randomStatetest178Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "0x6f33bb2d",
-                        "code" : "0x7d342beabe599e4bc177fd97d36df48d50650ba6129a9a83d4cf809ec21452357c620167f530c3265be9887f6e5b8186decdc00a6a801e5f56dd8d9d36a4806dbccc299e4bbf46ad577e25b5b1fc76b6999cb23a6a03c4035e36b8494135ee170647395da00b6e0a64c43f3358b8bdcf593c89fb70b865ef153b5195c77959256beb4f932095eb8ac80bc2c050f6f550a362aac77f5c4b197151df039d64b77dca22eb8fd4b8cf50fb85a36f1d909d1919a47fe97de5526726b4a47b866b7b13471056439457cd7cbc5060d978056ff5dd24a1f49e50b9f5924f473b2dc5306d67054ca575d0603e616291a3601460106009601f6338a57ddc73095e7baea6a6c7c4c2dfeb977efac326af552d87630e3319c8f133",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "0x0e348803",
-                        "code" : "0x6000355415600957005b60203560003555",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b329fbbcfe",
-                        "code" : "0x",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
         "logs" : [
             {
                 "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
@@ -62,25 +26,77 @@
             }
         ],
         "out" : "0x",
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
         "postStateRoot" : "6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7d342beabe599e4bc177fd97d36df48d50650ba6129a9a83d4cf809ec21452357c620167f530c3265be9887f6e5b8186decdc00a6a801e5f56dd8d9d36a4806dbccc299e4bbf46ad577e25b5b1fc76b6999cb23a6a03c4035e36b8494135ee170647395da00b6e0a64c43f3358b8bdcf593c89fb70b865ef153b5195c77959256beb4f932095eb8ac80bc2c050f6f550a362aac77f5c4b197151df039d64b77dca22eb8fd4b8cf50fb85a36f1d909d1919a47fe97de5526726b4a47b866b7b13471056439457cd7cbc5060d978056ff5dd24a1f49e50b9f5924f473b2dc5306d67054ca575d0603e616291a3601460106009601f6338a57ddc73095e7baea6a6c7c4c2dfeb977efac326af552d87630e3319c8f133",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,8 +111,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6f33bb2d"
             ]