1 files changed, 50 insertions, 67 deletions
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
index 5f1e01210..d5d164ed2 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
@@ -2,81 +2,64 @@
     "delegatecallInInitcodeToEmptyContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.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" : "0xfc586f571a68abde4664489c9403bcc34c00b5a5a901b08f20286ba4df9f6808",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "Frontier",
+                "result" : {
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "shouldnotexist" : "1"
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xf64b295c03ee71e17306638045fbdc1410407d4053da492f8d0439bf6d019dfa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x4d96399212e798bced58a2f159526808d3d3d3693ba75daa5a612710bae2b666",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Homestead",
+                    "EIP158",
+                    "EIP150"
+                ],
+                "result" : {
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "balance" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "10000",
+                "code" : "{ (MSTORE 0 0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b5620186) (MSTORE 32 0xa0f4600055000000000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "10000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -86,14 +69,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x06e9d9"
+                "453081"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                ""
             ]
         }
     }