regenerate hive tests

1 files changed, 57 insertions, 72 deletions

diff --git a/GeneralStateTests/stRandom/randomStatetest483.json b/GeneralStateTests/stRandom/randomStatetest483.json
index 110a5de51..f6373d075 100644
--- a/GeneralStateTests/stRandom/randomStatetest483.json
+++ b/GeneralStateTests/stRandom/randomStatetest483.json
@@ -2,92 +2,77 @@
     "randomStatetest483" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRandom/randomStatetest483Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "2129514006",
+                        "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe840955",
+                        "nonce" : "0",
+                        "storage" : {
+                            "0x" : "0x01"
+                        }
+                    },
+                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "balance" : "50785",
+                        "code" : "0x6000355415600957005b60203560003555",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999997870435255",
+                        "code" : "0x",
+                        "nonce" : "1",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "logs" : [
         ],
         "out" : "0x",
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
         "postStateRoot" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
         "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe840955",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x2e",
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "46",
                 "code" : "0x6000355415600957005b60203560003555",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -99,12 +84,12 @@
             "gasLimit" : [
                 "0x27a417be"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0x7eedce16"
+                "2129514006"
             ]
         }
     }