regenerate hive tests

1 files changed, 55 insertions, 81 deletions

diff --git a/GeneralStateTests/stCallCodes/callcallcall_000.json b/GeneralStateTests/stCallCodes/callcallcall_000.json
index 0099e7db6..2cb6dfb32 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000.json
@@ -2,102 +2,76 @@
     "callcallcall_000" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "30000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "ALL"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000002",
+                            "0x07" : "0x03"
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 2 ]] (CALL 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "0",
+                "code" : "{  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -107,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x2dc6c0"
+                "3000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }