regenerate hive tests

1 files changed, 82 insertions, 64 deletions

diff --git a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
index be435d5ce..46550888b 100644
--- a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
+++ b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
@@ -2,81 +2,99 @@
     "CreateContractFromMethod" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "100000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "1"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "balance" : "0",
+                        "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP150"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "1"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "balance" : "0",
+                        "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP158"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "1"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "balance" : "0",
+                        "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                        "nonce" : "1",
+                        "storage" : {
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "//" : "}\t\t\t\t\t\t\t\t\t",
+                "balance" : "100000",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -86,14 +104,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "0x055730"
+                "350000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0x01"
+                "1"
             ]
         }
     }