regenerate hive tests

1 files changed, 98 insertions, 162 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callChangeRevert.json b/GeneralStateTests/stStaticCall/static_callChangeRevert.json
index adc7f8329..973cb5212 100644
--- a/GeneralStateTests/stStaticCall/static_callChangeRevert.json
+++ b/GeneralStateTests/stStaticCall/static_callChangeRevert.json
@@ -2,196 +2,132 @@
     "static_callChangeRevert" : {
         "_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_callChangeRevertFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02"
                     }
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xa1a814154ba9bf8d4c027fe43f5216dae1123bd2f70e94296b71adf31884bf27",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000001" : {
+                        "balance" : "0x00"
+                    },
+                    "2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xedf534c3449840273633f020f057b42f6c24bffece5c4d8fd22acd6d3906c703",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x9862bd7f7e41739567c0fcf373a643e02199a8f8221784b8015d796d5cfa80b0",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xa38f4ab3a7fd701ac24ddf0c98be0a785709205e54754414d389a5560e686727",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02"
+                    },
+                    "3000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x01"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60006000600060006001731000000000000000000000000000000000000001620186a0f16000556000600060006000731000000000000000000000000000000000000001620186a0fa60015560006000600060006001731000000000000000000000000000000000000001620186a0f1600255",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (CALL 100000 0x1000000000000000000000000000000000000001 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000001 0 0 0 0) [[ 2 ]] (CALL 100000 0x1000000000000000000000000000000000000001 1 0 0 0 0) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600152",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "",
+                "code" : "{ (MSTORE 1 1)  }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6001600152600154600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "",
+                "code" : "{ (MSTORE 1 1) (SSTORE 1 (SLOAD 1)) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60006000600060006001731000000000000000000000000000000000000001620186a0f16000556000600060006000731000000000000000000000000000000000000001620186a0fa60015560006000600060006001731000000000000000000000000000000000000001620186a0f16002555b61c3506080511015608b576001608051016080526073565b",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (CALL 100000 0x1000000000000000000000000000000000000001 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000001 0 0 0 0) [[ 2 ]] (CALL 100000 0x1000000000000000000000000000000000000001 1 0 0 0 0) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x3000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60006000600060006001731000000000000000000000000000000000000002620186a0f16000556000600060006000731000000000000000000000000000000000000002620186a0fa60015560006000600060006001731000000000000000000000000000000000000002620186a0f1600255",
-                "nonce" : "0x00",
+            "3000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (CALL 100000 0x1000000000000000000000000000000000000002 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 0 0 0) [[ 2 ]] (CALL 100000 0x1000000000000000000000000000000000000002 1 0 0 0 0) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6000600060006000600060003562055730f1",
-                "nonce" : "0x00",
+            "a000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (CALL 350000 (CALLDATALOAD 0) 0 0 0 0 0)  }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -203,14 +139,14 @@
                 "0x0000000000000000000000003000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x0f4240"
+                "1000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xa000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a000000000000000000000000000000000000000",
             "value" : [
-                "0x0186a0"
+                "100000"
             ]
         }
     }