update general tests

1 files changed, 72 insertions, 94 deletions

diff --git a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
index ef92b6a4f..b8a470e06 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
@@ -6,109 +6,87 @@
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.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" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x08d5b6",
-                            "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
-                            "0x02" : "0x07bc62",
-                            "0x03" : "0x01",
-                            "0x64" : "0x071d49"
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "shouldnotexist" : "1"
-                    },
-                    "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "nonce" : "1"
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x08d5b6",
-                            "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
-                            "0x02" : "0x07bc62",
-                            "0x03" : "0x01",
-                            "0x64" : "0x06be35"
-                        }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "nonce" : "0"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "nonce" : "0"
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP150"
-                ],
-                "result" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x08d5b6",
-                            "0x01" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40",
-                            "0x02" : "0x07bc62",
-                            "0x03" : "0x01",
-                            "0x64" : "0x06bba1"
-                        }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "e1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "nonce" : "0"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
-                        "nonce" : "0"
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 0xe1ecf98489fa9ed60a664fc4998db699cfa39d40 0 0 0 0 0) [[100]] (GAS) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055602060006000f06001555a6002556000600060006000600073e1ecf98489fa9ed60a664fc4998db699cfa39d4061ea60f16003555a606455",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -118,14 +96,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }