1 files changed, 45 insertions, 77 deletions
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
index b7052c5ba..ac54f1aa4 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
@@ -2,95 +2,63 @@
     "callcodeInInitcodeToExistingContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "ALL",
+                "result" : {
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "balance" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x01"
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "10000",
+                "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }",
+                "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "1000",
+                "code" : "{ (MSTORE 0 0x6001600055) (CREATE 1 27 5) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0",
+                "code" : "{ (SSTORE 2 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -100,14 +68,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x06e9d9"
+                "453081"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                ""
             ]
         }
     }