update general tests

1 files changed, 74 insertions, 30 deletions

diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
index e8c55d4df..e4f4039de 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
@@ -6,36 +6,80 @@
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/OverflowGasRequireFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-                        "nonce" : "0"
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -45,14 +89,14 @@
                 "0x3240349548983454"
             ],
             "gasLimit" : [
-                "1606938044258990275541962092341162602522202993782792835301376"
+                "0x0100000000000000000000000000000000000000000000000000"
             ],
-            "gasPrice" : "720575940379279360",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x0a00000000000000",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }