From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Tue, 1 Aug 2017 11:04:30 +0300
Subject: update general tests

---
 GeneralStateTests/stRandom/randomStatetest30.json | 129 ++++++++++++----------
 1 file changed, 72 insertions(+), 57 deletions(-)

(limited to 'GeneralStateTests/stRandom/randomStatetest30.json')

diff --git a/GeneralStateTests/stRandom/randomStatetest30.json b/GeneralStateTests/stRandom/randomStatetest30.json
index c16df6359..749cf9a19 100644
--- a/GeneralStateTests/stRandom/randomStatetest30.json
+++ b/GeneralStateTests/stRandom/randomStatetest30.json
@@ -6,73 +6,88 @@
             "source" : "/src/GeneralStateTestsFiller/stRandom/randomStatetest30Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "1000000000000100000",
-                        "code" : "0x41314155",
-                        "nonce" : "0",
-                        "storage" : {
-                            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : "0x2e"
-                        }
-                    },
-                    "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41138",
-                        "code" : "0x6000355415600957005b60203560003555",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858908",
-                        "code" : "0x",
-                        "nonce" : "1",
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
         "logs" : [
         ],
         "out" : "0x",
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xb2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xb2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
         "postStateRoot" : "b2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41314155",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "46",
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x",
-                "nonce" : "0",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -82,14 +97,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
-- 
cgit v1.2.3