update general tests

1 files changed, 68 insertions, 136 deletions

diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
index b604a396b..fc30a43f3 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
@@ -6,166 +6,98 @@
             "source" : "/src/GeneralStateTestsFiller/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.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"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000010" : {
-                        "balance" : "111"
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x479fef1d31182ab6f401423f71268b338d5ab64cf0134b1d00429fbbb2681bc8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999765606",
-                        "nonce" : "1"
-                    },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x12",
-                            "0x01" : "0x20",
-                            "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
-                            "0x03" : "0xe8d49be840",
-                            "0x04" : "0x12",
-                            "0x07" : "0x01",
-                            "0x08" : "0x01",
-                            "0x0a" : "0x05e249",
-                            "0x64" : "0x11"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "EIP158"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000010" : {
-                        "balance" : "111"
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999790606",
-                        "nonce" : "1"
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x12",
-                            "0x01" : "0x20",
-                            "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
-                            "0x03" : "0xe8d49be840",
-                            "0x04" : "0x12",
-                            "0x07" : "0x01",
-                            "0x08" : "0x01",
-                            "0x0a" : "0x0643f1",
-                            "0x64" : "0x11"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000010" : {
-                        "balance" : "111"
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999400000",
-                        "nonce" : "1"
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x55d3f32c0cb176382fbd4970701b62a8e9b01e83c9e83b203b1aceeef65ca3ea",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x12",
-                            "0x01" : "0",
-                            "0x02" : "0",
-                            "0x03" : "0",
-                            "0x04" : "0",
-                            "0x07" : "0",
-                            "0x08" : "0",
-                            "0x0a" : "0",
-                            "0x64" : "0"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Homestead"
-                ],
-                "result" : {
-                    "1000000000000000000000000000000000000010" : {
-                        "balance" : "111"
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xa70ebcc9693ee6433f20def41c872b787d82673ab6d421a80174e8b5968d3a62",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999770136",
-                        "nonce" : "1"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x12",
-                            "0x01" : "0x20",
-                            "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000",
-                            "0x03" : "0xe8d49be840",
-                            "0x04" : "0x12",
-                            "0x07" : "0x01",
-                            "0x08" : "0x01",
-                            "0x0a" : "0x05f3fb",
-                            "0x64" : "0x11"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "1000000000000000000000000000000000000010" : {
+            "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000011" : {
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
                 "code" : "0x6011606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
                 "nonce" : "0x00",
@@ -181,12 +113,12 @@
             "gasLimit" : [
                 "0x0927c0"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }