regenerate hive tests

1 files changed, 78 insertions, 183 deletions

diff --git a/GeneralStateTests/stRevertTest/RevertOpcode.json b/GeneralStateTests/stRevertTest/RevertOpcode.json
index 46a589df8..41c65d23b 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcode.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcode.json
@@ -2,201 +2,96 @@
     "RevertOpcode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
+                "network" : [
+                    "Frontier",
+                    "Homestead",
+                    "EIP150",
+                    "EIP158"
+                ],
+                "result" : {
+                    "a000000000000000000000000000000000000000" : {
+                        "balance" : "0",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 0,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "a000000000000000000000000000000000000000" : {
+                        "balance" : "0",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999958985",
+                        "nonce" : "1"
                     }
                 }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 1
-                    }
-                },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    }
+            },
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
                 },
-                {
-                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 1
+                "network" : [
+                    "Metropolis"
+                ],
+                "result" : {
+                    "a000000000000000000000000000000000000000" : {
+                        "balance" : "0",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999970000",
+                        "nonce" : "1"
                     }
                 }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+            "a000000000000000000000000000000000000000" : {
+                "balance" : "0",
                 "code" : "0x600160005560016000fd6011600155",
-                "nonce" : "0x00",
+                "nonce" : "",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -206,16 +101,16 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0c3500",
-                "0x7530"
+                "800000",
+                "30000"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xa000000000000000000000000000000000000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "a000000000000000000000000000000000000000",
             "value" : [
-                "0x00",
-                "0x0a"
+                "0",
+                "10"
             ]
         }
     }