1 files changed, 78 insertions, 40 deletions
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
index 9ee18c24f..11a6d50dc 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
@@ -6,49 +6,87 @@
             "source" : "/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.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",
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "nonce" : "0"
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "//" : "{[[0]] 12 (MSTORE 32 0x602060406000f0)(RETURN 57 7)}",
-                "balance" : "10000",
-                "code" : "{(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 100000 11 21)}",
-                "nonce" : "0",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x2710",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -58,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"
             ]
         }
     }