update general tests

1 files changed, 80 insertions, 68 deletions

diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
index 21ed73f7f..0fe7c403a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
@@ -6,82 +6,94 @@
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.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" : {
-                    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x074f16",
-                            "0x01" : "0x06ac91",
-                            "0x02" : "0x752e"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead"
-                ],
-                "result" : {
-                    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                        }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x00" : "0x074f16",
-                            "0x01" : "0x06af25",
-                            "0x02" : "0x752e"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "",
-                "code" : "{ [[2]] (GAS) }",
-                "nonce" : "0",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600255",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0",
-                "code" : "{ [[0]] (GAS) (CALLCODE 30000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 8000 0 8000) [[1]] (GAS) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -91,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }