update general tests

1 files changed, 78 insertions, 55 deletions

diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
index 13d4d2751..c9d92088a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
@@ -6,71 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x" : "0x01"
-                        }
-                    }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x401",
-                            "0x01" : "0x01"
-                        }
-                    }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "7000",
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1024",
-                "code" : "{ [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b @@0 0 0 0 0) }",
-                "nonce" : "0",
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -82,12 +105,12 @@
             "gasLimit" : [
                 "0x7ffffffffffffff0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }