regenerate hive tests

1 files changed, 39 insertions, 111 deletions

diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
index 15318313f..ca43777f0 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
@@ -2,128 +2,56 @@
     "CALLCODE_Bounds2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/CALLCODE_Bounds2Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xea11e8bc4d29f7fc9f83fe4212e7bc19e1a3d7a9d9a6f0ead9d9b22ba786d0b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
+                "network" : [
+                    "ALL"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "balance" : "0",
+                        "storage" : {
+                            "0x00" : "0x00"
+                        }
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
-                "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0",
+                "code" : "{ (CALLCODE 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff)  }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600054600101600055",
-                "nonce" : "0x00",
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0",
+                "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -133,15 +61,15 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0249f0",
-                "0x0ee6b280"
+                "150000",
+                "250000000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
             "value" : [
-                "0x01"
+                "1"
             ]
         }
     }