regenerate hive tests

1 files changed, 109 insertions, 129 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcall_00.json b/GeneralStateTests/stStaticCall/static_callcall_00.json
index e1f6ac18c..277069709 100644
--- a/GeneralStateTests/stStaticCall/static_callcall_00.json
+++ b/GeneralStateTests/stStaticCall/static_callcall_00.json
@@ -2,163 +2,143 @@
     "static_callcall_00" : {
         "_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_callcall_00Filler.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" : "0xa56f03e8f4202c99bd39219b63a6b4b7998005401bb2d9d6a06b3b9a7b289dfc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa56f03e8f4202c99bd39219b63a6b4b7998005401bb2d9d6a06b3b9a7b289dfc",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xa56f03e8f4202c99bd39219b63a6b4b7998005401bb2d9d6a06b3b9a7b289dfc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa56f03e8f4202c99bd39219b63a6b4b7998005401bb2d9d6a06b3b9a7b289dfc",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x8bcc5b5581f6ee23ddbbd5a93f1f4588826db595e695e98eabe8444f4a339b3a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x8bcc5b5581f6ee23ddbbd5a93f1f4588826db595e695e98eabe8444f4a339b3a",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x04" : "0x00",
+                            "0x07" : "0x00",
+                            "0xe6" : "0x00",
+                            "0xe8" : "0x00",
+                            "0xec" : "0x00",
+                            "0xee" : "0x00",
+                            "0xf0" : "0x00"
+                        }
+                    },
+                    "a000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x28fea6"
+                        }
                     }
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x8bcc5b5581f6ee23ddbbd5a93f1f4588826db595e695e98eabe8444f4a339b3a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x8bcc5b5581f6ee23ddbbd5a93f1f4588826db595e695e98eabe8444f4a339b3a",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xd6f289168402ca1dfbb871fe608ed3096126165304d525f91c7c8d18148e9eca",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x77399cc4286fe72df69cceb346f61cc2e15ef10efb4ea597735bc149ccd9908d",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "2000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x04" : "0x00",
+                            "0x07" : "0x00",
+                            "0xe6" : "0x00",
+                            "0xe8" : "0x00",
+                            "0xec" : "0x00",
+                            "0xee" : "0x00",
+                            "0xf0" : "0x00"
+                        }
+                    },
+                    "a000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2ccedd"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730fa600055",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090fa",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (STATICCALL 250000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE))}",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073200000000000000000000000000000000000000162055730fa600055",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x2000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007320000000000000000000000000000000000000026203d090fa",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (STATICCALL 250000 0x2000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6001600052336020523460405230606052326080523660a0523860c0523a60e052",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (MSTORE 0 1) (MSTORE 32 (CALLER)) (MSTORE 64 (CALLVALUE)) (MSTORE 96 (ADDRESS)) (MSTORE 128 (ORIGIN)) (MSTORE 160 (CALLDATASIZE)) (MSTORE 192 (CODESIZE)) (MSTORE 224 (GASPRICE))}",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
-                "code" : "0x6000600060006000346000355af16000555a600155",
-                "nonce" : "0x00",
+            "a000000000000000000000000000000000000000" : {
+                "balance" : "0",
+                "code" : "{  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -169,14 +149,14 @@
                 "0x0000000000000000000000002000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "0x2dc6c0"
+                "3000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xa000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }