regenerate hive tests

1 files changed, 57 insertions, 81 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2.json b/GeneralStateTests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2.json
index 0377ec1a1..922f302b9 100644
--- a/GeneralStateTests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2.json
+++ b/GeneralStateTests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2.json
@@ -2,102 +2,78 @@
     "static_callcallcallcode_001_SuicideMiddle2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.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" : "0xbb35ca677e4ff8b6aa1ff1ada4b98c1938f01c170bbc081e151cbd23bae75727",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "balance" : "1000000000000000000",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2b9a37"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "balance" : "10000000000",
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xbb35ca677e4ff8b6aa1ff1ada4b98c1938f01c170bbc081e151cbd23bae75727",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xbb35ca677e4ff8b6aa1ff1ada4b98c1938f01c170bbc081e151cbd23bae75727",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xbb35ca677e4ff8b6aa1ff1ada4b98c1938f01c170bbc081e151cbd23bae75727",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x2bc88ae82918fe1e2a1fa1c091ecabbbd33f679050a924a6a6d130e8203c3857",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0fa6000555a600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 )  [[ 1 ]] (GAS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000002620186a0fa506001602052",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "10000000000",
+                "code" : "{  (MSTORE 3 1) (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "10000000000",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600352",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "10000000000",
+                "code" : "{  (MSTORE 3 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -107,14 +83,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x2dc6c0"
+                "3000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }