update general tests

1 files changed, 83 insertions, 40 deletions

diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
index d34419bb7..48a83fb88 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
@@ -6,51 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stTransactionTest/InternalCallHittingGasLimit2Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "47766",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0xba96",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0",
-                        "storage" : {
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ (CALL 25000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{[[1]]55}",
-                "nonce" : "0",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6037600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -60,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "47766"
+                "0xba96"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }