update general tests

1 files changed, 82 insertions, 59 deletions

diff --git a/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsOOG.json b/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsOOG.json
index 2fde1d1ed..f8541627f 100644
--- a/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsOOG.json
@@ -6,58 +6,82 @@
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
-            "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" : [
-                    "Metropolis"
-                ],
-                "result" : {
-                    "0000000000000000000000000000000000000000" : {
-                        "balance" : "0",
-                        "storage" : {
-                            "0x" : "0x0c",
-                            "0x01" : "0x0c",
-                            "0x02" : "0x0c",
-                            "0x03" : "0x0c",
-                            "0x04" : "0x0c",
-                            "0x05" : "0x0c",
-                            "0x06" : "0x0c",
-                            "0x07" : "0x0c",
-                            "0x08" : "0x0c",
-                            "0x09" : "0x0c"
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0xb82cca58ebd153dfe1ff4dcfdaebe887fb254792fa4d7311778c0454774340e5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "nonce" : "1"
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xb82cca58ebd153dfe1ff4dcfdaebe887fb254792fa4d7311778c0454774340e5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "20",
-                        "storage" : {
-                            "0x01" : "0x00"
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0xb82cca58ebd153dfe1ff4dcfdaebe887fb254792fa4d7311778c0454774340e5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xb82cca58ebd153dfe1ff4dcfdaebe887fb254792fa4d7311778c0454774340e5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xa2612c8ed14c9ebbaeeca9546f2c273abe8c71fb6d43c893bd1ac9e3f9c86370",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "{(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}",
-                "nonce" : "0",
+            "0x0000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x" : "0x0c",
+                    "0x00" : "0x0c",
                     "0x01" : "0x0c",
                     "0x02" : "0x0c",
                     "0x03" : "0x0c",
@@ -69,18 +93,17 @@
                     "0x09" : "0x0c"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "//" : "gas = 19 going OOG, gas = 20 fine",
-                "balance" : "10",
-                "code" : "{ [[ 1 ]] (STATICCALL 40000 0 0 0 0 0) }",
-                "nonce" : "0",
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x60006000600060006000619c40fa600155",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -90,14 +113,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160000"
+                "0x027100"
             ],
-            "gasPrice" : "1",
-            "nonce" : "",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }