update general tests

1 files changed, 87 insertions, 45 deletions

diff --git a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert.json b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert.json
index 29a5c23d0..79553ffc7 100644
--- a/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert.json
+++ b/GeneralStateTests/stStaticCall/static_LoopCallsDepthThenRevert.json
@@ -6,59 +6,101 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000000" : {
-                        "storage" : {
-                            "0x00" : "0x01",
-                            "0x01" : "0x88c8c6"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x5fd4c444b2f9281082c710d2fd94a82ede14513b458c6de033021f06b252b063",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x5fd4c444b2f9281082c710d2fd94a82ede14513b458c6de033021f06b252b063",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x59ea02d8c54b83231ae4637378a000aa6674e585d67a12db3647532b7102f6d8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x59ea02d8c54b83231ae4637378a000aa6674e585d67a12db3647532b7102f6d8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x5fd4c444b2f9281082c710d2fd94a82ede14513b458c6de033021f06b252b063",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "",
-                "code" : "{ [[ 0 ]] (CALL ( - (GAS) 100000) 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[ 1 ]] (GAS) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000620186a05a03f16000555a600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
-                "balance" : "",
-                "code" : "{ (STATICCALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0) }",
-                "nonce" : "0",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b0000000000000000000000000000000000000005afa",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
-                "balance" : "",
-                "code" : "{ (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0)  }",
-                "nonce" : "",
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073a0000000000000000000000000000000000000005afa",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -68,14 +110,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }