update general tests

1 files changed, 83 insertions, 38 deletions

diff --git a/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimit.json b/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimit.json
index 7e5f27530..04f357fa4 100644
--- a/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimit.json
+++ b/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimit.json
@@ -6,49 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimitFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "22000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x55f0",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "978900"
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xb26b5f58fec9d44f7980e9859d4a004456d0d05fc86878865e3d1349588cbca2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xb26b5f58fec9d44f7980e9859d4a004456d0d05fc86878865e3d1349588cbca2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xb26b5f58fec9d44f7980e9859d4a004456d0d05fc86878865e3d1349588cbca2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xb26b5f58fec9d44f7980e9859d4a004456d0d05fc86878865e3d1349588cbca2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xb26b5f58fec9d44f7980e9859d4a004456d0d05fc86878865e3d1349588cbca2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000",
-                "code" : "{ (STATICCALL 5000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b611388fa",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
-                "nonce" : "0",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5b61c35060805110156018576001608051016080526000565b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -58,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21100"
+                "0x526c"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }