update general tests

1 files changed, 79 insertions, 71 deletions

diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
index fce782900..0b70847df 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
@@ -6,86 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.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" : [
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x08d5b6",
-                            "0x01" : "0x01",
-                            "0x64" : "0x081c71"
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0",
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x08d5b6",
-                            "0x01" : "0x01",
-                            "0x64" : "0x081f05"
-                        }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0",
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000",
-                "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
@@ -96,14 +104,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }