update general tests

1 files changed, 123 insertions, 93 deletions

diff --git a/GeneralStateTests/stQuadraticComplexityTest/Call1MB1024Calldepth.json b/GeneralStateTests/stQuadraticComplexityTest/Call1MB1024Calldepth.json
index 8e601c143..2f83de3ca 100644
--- a/GeneralStateTests/stQuadraticComplexityTest/Call1MB1024Calldepth.json
+++ b/GeneralStateTests/stQuadraticComplexityTest/Call1MB1024Calldepth.json
@@ -6,114 +6,144 @@
             "source" : "/src/GeneralStateTestsFiller/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "882500000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0xcd79195900",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xc984998b8052ddaab793053cb1aedd9d5c1a29c83cc85f67181a2d702ddc6f4c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
+                {
+                    "hash" : "0xb8e0db77fd8d5ec9d189830716c4fb5c9d5fcc46e549c0747c7be87c8967c37a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
                     },
-                    "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0fffffffffffff",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xc984998b8052ddaab793053cb1aedd9d5c1a29c83cc85f67181a2d702ddc6f4c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "250000000",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb8e0db77fd8d5ec9d189830716c4fb5c9d5fcc46e549c0747c7be87c8967c37a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
                     },
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x60016000540160005561040060005410601b5760016002556047565b60006000620f42406000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03f16001555b",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
-                    "value" : -1
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc984998b8052ddaab793053cb1aedd9d5c1a29c83cc85f67181a2d702ddc6f4c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7461fbfc0748c82d2c4633ffcadddb667269d903e6a57953e467fce356c8dd5c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc984998b8052ddaab793053cb1aedd9d5c1a29c83cc85f67181a2d702ddc6f4c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
+                {
+                    "hash" : "0x7461fbfc0748c82d2c4633ffcadddb667269d903e6a57953e467fce356c8dd5c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
                     },
-                    "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0fffffffffffff",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xc984998b8052ddaab793053cb1aedd9d5c1a29c83cc85f67181a2d702ddc6f4c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "139425287",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb8e0db77fd8d5ec9d189830716c4fb5c9d5fcc46e549c0747c7be87c8967c37a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
                     },
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x60016000540160005561040060005410601b5760016002556047565b60006000620f42406000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03f16001555b",
-                        "nonce" : "0x00",
-                        "storage" : {
-                            "0x00" : "0x45",
-                            "0x01" : "0x01"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffff",
+            "0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffff",
-                "code" : "{ (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (CALL (- (GAS) 1005000) 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 1000000 0 0) [[ 2 ]] 1 )  }",
-                "nonce" : "0",
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffff",
+                "code" : "0x60016000540160005561040060005410601b5760016002556047565b60006000620f42406000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620f55c85a03f16001555b",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -123,15 +153,15 @@
                 ""
             ],
             "gasLimit" : [
-                "150000",
-                "250000000"
+                "0x0249f0",
+                "0x0ee6b280"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }