regenerate hive tests

1 files changed, 54 insertions, 124 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter.json
index a79a15267..b272b89bd 100644
--- a/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter.json
@@ -2,149 +2,79 @@
     "static_callcallcodecall_010_OOGMAfter" : {
         "_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_callcallcodecall_010_OOGMAfterFiller.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" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xe30eacc3c2c6cbdb91057adbaac53768546552d6d0dcc6ef95e182e95ec0f2c6",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x6332d2b26543f5b5c66a0b39aae2bfe466532e049bfe712dc7a5bc12f3733107",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x6332d2b26543f5b5c66a0b39aae2bfe466532e049bfe712dc7a5bc12f3733107",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x014b7e",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060003561eaf6fa6000555a600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4506001600355",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0",
+                "code" : "{  (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SSTORE 3 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e48fa",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (STATICCALL 20040 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600352",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "0",
+                "code" : "{  (MSTORE 3 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4505b61c3506080511015603a576001608051016080526022565b",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "0",
+                "code" : "{  (DELEGATECALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -155,14 +85,14 @@
                 "0x0000000000000000000000002000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
-                "0x029fe0"
+                "172000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }