regenerate hive tests

1 files changed, 95 insertions, 64 deletions

diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
index 2a3f9fcdd..0702eed0c 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
@@ -2,81 +2,112 @@
     "RecursiveCreateContracts" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.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" : "0xde2b270f7ca346807238c5d102d518d261a6abf4ff217a70ca1c7e7251bfb3ed",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Frontier",
+                    "Homestead"
+                ],
+                "result" : {
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "300000"
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP150"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x314dc6448d9338c15b0a00000001",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                            "0x01" : "0x0304"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "293976"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "nonce" : "0x00",
+                        "storage" : {
+                            "0x00" : "0x0303"
+                        }
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "EIP158"
+                ],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x314dc6448d9338c15b0a00000001",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                            "0x01" : "0x0304"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x047c5d"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x0303"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x314dc6448d9338c15b0a00000000",
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "//" : "}",
+                "balance" : "1000000000000000000000000000000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4c4b40",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "5000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -86,14 +117,14 @@
                 "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304"
             ],
             "gasLimit" : [
-                "0x0493e0"
+                "300000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0x01"
+                "1"
             ]
         }
     }