update general tests

1 files changed, 72 insertions, 98 deletions

diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
index d993a7aa4..36ea9924c 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
@@ -6,113 +6,87 @@
             "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "100000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x05f5e100",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "nonce" : "1",
-                        "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x5cc580fa6536cadacd23d6d5f7afb50076a5f7889832cfca9dc0a10473900898",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
-                    },
-                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                        "balance" : "1",
-                        "nonce" : "0",
-                        "storage" : {
-                            "0x" : "0x0c"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP158"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "nonce" : "1",
-                        "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                        "balance" : "1",
-                        "nonce" : "1",
-                        "storage" : {
-                            "0x" : "0x0c"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP150"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "nonce" : "1",
-                        "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                        "balance" : "1",
-                        "nonce" : "0",
-                        "storage" : {
-                            "0x" : "0x0c"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}",
-                "balance" : "112",
-                "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 12 0 0 0 0)}",
-                "nonce" : "0",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x70",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -122,14 +96,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }