even more failures

1 files changed, 10 insertions, 43 deletions

diff --git a/StateTests/RandomTests/st201503181826GO.json b/StateTests/RandomTests/st201503181826GO.json
index a7b8ac5fd..dcbbd0416 100644
--- a/StateTests/RandomTests/st201503181826GO.json
+++ b/StateTests/RandomTests/st201503181826GO.json
@@ -13,57 +13,33 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-<<<<<<< HEAD
-                "balance" : "1743692017",
-                "code" : "0x447f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f07959542943c5a54998f6b9d6515765560005155",
+                "balance" : "1695402986",
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000000000000000000000000000000000000000c350437f0000000000000000000000000000000000000000000000000000000000000000377f00000000000000000000000000000000000000000000000000000000000000005060005155",
                 "nonce" : "0",
                 "storage" : {
-                    "0x" : "0x07959542943c5a54998f6b9d65157655"
+                    "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffff" : "0x051d6a3cd647"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "49305",
-=======
-                "balance" : "173318827",
-                "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016ff03214187d6286078b7a45396d02ff5560005155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x" : "0xf03214187d6286078b7a45396d02ff55"
-                }
-            },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "51026",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "57686",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-<<<<<<< HEAD
-                "balance" : "999999998256258724",
-=======
-                "balance" : "999999999826630193",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "999999998304539374",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-<<<<<<< HEAD
-        "postStateRoot" : "2f337f8eb50322f2882091afebd5a1f61ef2cd4fa04c48a743c4cb435977d441",
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0",
-                "code" : "0x447f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f07959542943c5a54998f6b9d6515765560005155",
-=======
-        "postStateRoot" : "7e0a9c87dda93a97e520b798334039b6aa12c9f0d66ee2a70605f7ed2a673052",
+        "postStateRoot" : "6d2d7b4aabd11db03558df9b6273051f9eae5563cd4bec67faa7df838e8f4893",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
-                "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016ff03214187d6286078b7a45396d02ff5560005155",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000000000000000000000000000000000000000c350437f0000000000000000000000000000000000000000000000000000000000000000377f00000000000000000000000000000000000000000000000000000000000000005060005155",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,22 +60,13 @@
             }
         },
         "transaction" : {
-<<<<<<< HEAD
-            "data" : "0x447f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f07959542943c5a54998f6b9d651576",
-            "gasLimit" : "0x5c1f4e2c",
-=======
-            "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016ff03214187d6286078b7a45396d02ff",
-            "gasLimit" : "0x445c75e8",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000000000000000000000000000000000000000c350437f0000000000000000000000000000000000000000000000000000000000000000377f000000000000000000000000000000000000000000000000000000000000000050",
+            "gasLimit" : "0x159a3301",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-<<<<<<< HEAD
-            "value" : "1743692017"
-=======
-            "value" : "173318827"
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "value" : "1695402986"
         }
     }
 }