update general tests

1 files changed, 91 insertions, 57 deletions

diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
index 419cc3e70..005a50fa5 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
@@ -6,74 +6,108 @@
             "source" : "/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "30000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x01c9c380",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x01",
-                            "0x014a" : "0x1000000000000000000000000000000000000001",
-                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                            "0x0150" : "0x40",
-                            "0x0152" : "0x26",
-                            "0x0154" : "0x01",
-                            "0x02" : "0x01",
-                            "0x03" : "0x01",
-                            "0x04" : "0x1000000000000000000000000000000000000001",
-                            "0x07" : "0x03"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (CALL 350000 0x1000000000000000000000000000000000000001 1 0 64 0 64 ) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
-                "balance" : "1000000000000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000003 3 0 64 0 64 ) }",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
-                "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}",
-                "nonce" : "0",
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -83,14 +117,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }