update general tests

1 files changed, 84 insertions, 57 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stStaticCall/static_callcallcall_ABCB_RECURSIVE.json
index 833358673..8025ba8f9 100644
--- a/GeneralStateTests/stStaticCall/static_callcallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stStaticCall/static_callcallcall_ABCB_RECURSIVE.json
@@ -6,74 +6,101 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "3000000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0xb2d05e00",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00"
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x36a4b476a03b3ed0952af53f0284afc3ac9e3a7737db2b3f1a5f9594c9a9cb88",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x36a4b476a03b3ed0952af53f0284afc3ac9e3a7737db2b3f1a5f9594c9a9cb88",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x36a4b476a03b3ed0952af53f0284afc3ac9e3a7737db2b3f1a5f9594c9a9cb88",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "139959"
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x36a4b476a03b3ed0952af53f0284afc3ac9e3a7737db2b3f1a5f9594c9a9cb88",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x1681a7d9af60c72fcb6a0aa0daea9e63929ccce3348654a5fcdb85234b75fad4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  (MSTORE 1 1) (STATICCALL 25000000 0x1000000000000000000000000000000000000001 0 64 0 64 ) (MSTORE 2 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600152604060006040600073100000000000000000000000000000000000000163017d7840fa506001600252",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "10000000000",
-                "code" : "{   (MSTORE 3 1) (STATICCALL 1000000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 4 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000002620f4240fa506001600452",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "10000000000",
-                "code" : "{ (MSTORE 5 1) (STATICCALL 500000 0x1000000000000000000000000000000000000001 0 64 0 64 ) (MSTORE 6 1) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x600160055260406000604060007310000000000000000000000000000000000000016207a120fa506001600652",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -83,14 +110,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }