regenerate hive tests

1 files changed, 67 insertions, 121 deletions

diff --git a/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_2.json b/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_2.json
index ec3e6bf11..314eff335 100644
--- a/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_2.json
+++ b/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_2.json
@@ -2,149 +2,95 @@
     "static_callcallcodecallcode_011_2" : {
         "_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_callcallcodecallcode_011_2Filler.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" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d1cf3"
+                        }
                     }
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2ef4ce9928e12ef46bd37c473fa224226d6f4893ea7b94346c23e573e32eefbd",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x9db7831768f2ee813548e2ef021daf6ad66d2703c19342c41f8839efaaeb0767",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0x3e51020794ae37feb46ed74fb683949978ebf620609e854fdae15cb5a7e8cc00",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d02c7"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600035600052604060006040600073100000000000000000000000000000000000000162055730fa6000555a600155",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000600035620493e0f2",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (CALLCODE 300000 (CALLDATALOAD 0) 0 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000036203d090f2",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (CALLCODE 250000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600152",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "0",
+                "code" : "{  (MSTORE 1 1) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x2000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f2",
-                "nonce" : "0x00",
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (CALLCODE 250000 0x1000000000000000000000000000000000000003 1 0 64 0 64 ) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -155,14 +101,14 @@
                 "0x0000000000000000000000002000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
-                "0x2dc6c0"
+                "3000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }