update general tests

1 files changed, 227 insertions, 55 deletions

diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
index 6a47de4b2..b33628708 100644
--- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
+++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
@@ -6,65 +6,237 @@
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 0,
-                    "value" : 0
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "balance" : "1",
-                        "nonce" : "0",
-                        "storage" : {
-                        }
-                    }
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
-                    "value" : 0
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "a000000000000000000000000000000000000000" : {
-                        "balance" : "1",
-                        "nonce" : "0",
-                        "storage" : {
-                            "0x00" : "0x0d",
-                            "0x01" : "0x0e"
-                        }
-                    }
+                {
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
-                "balance" : "1",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
-                "nonce" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -74,16 +246,16 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "66500",
-                "181000"
+                "0x0103c4",
+                "0x02c308"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }