update general tests

1 files changed, 65 insertions, 182 deletions

diff --git a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
index f19b1cd3a..6ca137db3 100644
--- a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
+++ b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
@@ -6,203 +6,86 @@
             "source" : "/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.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" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP158"
-                ],
-                "result" : {
-                    "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x03",
-                        "storage" : {
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x7a281a1ce18be77fa72d654767a410e2244f172c744ee2ac1154960f4981a3b4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x044dec",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : {
-                        "balance" : "0x00",
-                        "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    },
-                    "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
-                        "balance" : "0xfffffffffffffbb213",
-                        "code" : "0x",
-                        "nonce" : "0x0150",
-                        "storage" : {
-                        }
-                    },
-                    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP150"
-                ],
-                "result" : {
-                    "13d3d0eedf83404aa5cc882d6756098cd21e3f56" : {
-                        "balance" : "0x00",
-                        "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x02",
-                        "storage" : {
-                        }
-                    },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "307092",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
-                        "balance" : "4722366482869644906603",
-                        "code" : "0x",
-                        "nonce" : "0x0150",
-                        "storage" : {
-                        }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x02",
-                        "storage" : {
-                        }
-                    },
-                    "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : {
-                        "shouldnotexist" : "1"
-                    },
-                    "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
-                        "code" : "0x",
-                        "nonce" : "0x0150",
-                        "storage" : {
-                        }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x6243be0d831b29c25ba9250267d6c78bc84e087c1d0d9b76f7fc40212ae857e2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
-                        "balance" : "0x00",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "0x1bc78ae0e5ec5cb439f1d5355d6f90d38343e109" : {
-                        "balance" : "0x00",
-                        "code" : "",
-                        "nonce" : "0x03",
-                        "storage" : {
-                        }
-                    },
-                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x044dec",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "0x51f9d7f98e997bdd6bebde4c2dd27be8c99303aa" : {
-                        "balance" : "0x00",
-                        "code" : "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x413833e5cb37a0c12c8e02c380e3c51587a102c5b02f1a65dc42a89b89224275",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
-                        "balance" : "0xfffffffffffffbb213",
-                        "code" : "",
-                        "nonce" : "0x0150",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
-                        "balance" : "0x00",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
+            "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
                 "balance" : "0xffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x014f",
                 "storage" : {
                 }
             },
-            "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -215,12 +98,12 @@
             "gasLimit" : [
                 "0x1fffff"
             ],
-            "gasPrice" : "1",
+            "gasPrice" : "0x01",
             "nonce" : "0x014f",
-            "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+            "secretKey" : "0xc85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }