update general tests

1 files changed, 74 insertions, 80 deletions

diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 6c1329077..1c67be61c 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -6,93 +6,87 @@
             "source" : "/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "42949672960",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : "Frontier",
-                "result" : {
-                    "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "code" : "0x60f1630fffffff53",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x0a00000000",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x5a00000000",
-                        "code" : "0x",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            },
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : -1,
-                    "value" : -1
-                },
-                "network" : [
-                    "Homestead",
-                    "EIP150",
-                    "EIP158"
-                ],
-                "result" : {
-                    "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "code" : "0x60f1630fffffff53",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x0a00000000",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x5a00000000",
-                        "code" : "0x",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ]
+        },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x60F1630FFFFFFF53",
-                "nonce" : "0",
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60f1630fffffff53",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496729600",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
                 "code" : "",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -102,14 +96,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }