update general tests

1 files changed, 127 insertions, 42 deletions

diff --git a/GeneralStateTests/stLogTests/log2_Caller.json b/GeneralStateTests/stLogTests/log2_Caller.json
index 503b32155..ead7acbe6 100644
--- a/GeneralStateTests/stLogTests/log2_Caller.json
+++ b/GeneralStateTests/stLogTests/log2_Caller.json
@@ -6,54 +6,139 @@
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x0f4240",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Frontier",
-                    "Homestead",
-                    "EIP158",
-                    "EIP150"
-                ],
-                "result" : {
-                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x" : "0x01"
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
                         }
-                    }
+                    ]
                 }
-            }
-        ],
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "1000000000000000000",
-                "code" : "{ [[ 0 ]] (CALL 1000 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0) }",
-                "nonce" : "0",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "{ (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }",
-                "nonce" : "0",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60005333600060206000a2",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000000000000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -63,14 +148,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }