regenerate hive tests

1 files changed, 53 insertions, 84 deletions

diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
index a01d5c330..8d55eb90a 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
@@ -2,109 +2,78 @@
     "TouchToEmptyAccountRevert3" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/TouchToEmptyAccountRevert3Filler.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" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [
+                    "ALL"
+                ],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "balance" : "",
+                        "code" : "",
+                        "nonce" : "0",
+                        "storage" : {
+                        }
                     }
                 }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
+            }
+        ],
         "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x6000600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16002556001600355",
-                "nonce" : "0x00",
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "code" : "{ [[2]](CALL 30000 0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[3]] 1 }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
-                "nonce" : "0x00",
+            "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "code" : "{ [[0]](CALL 30000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
+            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             },
-            "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
+            "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+                "nonce" : "0",
                 "storage" : {
                 }
             }
@@ -114,14 +83,14 @@
                 ""
             ],
             "gasLimit" : [
-                "0x0141e0"
+                "82400"
             ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0x00"
+                "0"
             ]
         }
     }