corrected tests and different style for storage

1 files changed, 64 insertions, 192 deletions

diff --git a/vmtests/vmPushDupSwapTest.json b/vmtests/vmPushDupSwapTest.json
index dcc9e8a6e..444ccc5d8 100644
--- a/vmtests/vmPushDupSwapTest.json
+++ b/vmtests/vmPushDupSwapTest.json
@@ -28,9 +28,7 @@
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff80600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -73,9 +71,7 @@
                 "code" : "0x600a60096008600760066005600460036002600189600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0a"
-                    ]
+                    "0x03" : "0x0a"
                 }
             }
         },
@@ -118,9 +114,7 @@
                 "code" : "0x600b600a6009600860076006600560046003600260018a600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0b"
-                    ]
+                    "0x03" : "0x0b"
                 }
             }
         },
@@ -163,9 +157,7 @@
                 "code" : "0x600c600b600a6009600860076006600560046003600260018b600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0c"
-                    ]
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -208,9 +200,7 @@
                 "code" : "0x600d600c600b600a6009600860076006600560046003600260018c600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0d"
-                    ]
+                    "0x03" : "0x0d"
                 }
             }
         },
@@ -253,9 +243,7 @@
                 "code" : "0x600e600d600c600b600a6009600860076006600560046003600260018d600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0e"
-                    ]
+                    "0x03" : "0x0e"
                 }
             }
         },
@@ -298,9 +286,7 @@
                 "code" : "0x600f600e600d600c600b600a6009600860076006600560046003600260018e600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x0f"
-                    ]
+                    "0x03" : "0x0f"
                 }
             }
         },
@@ -343,9 +329,7 @@
                 "code" : "0x6010600f600e600d600c600b600a6009600860076006600560046003600260018f600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x10"
-                    ]
+                    "0x03" : "0x10"
                 }
             }
         },
@@ -388,9 +372,7 @@
                 "code" : "0x6002600181600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x02"
-                    ]
+                    "0x03" : "0x02"
                 }
             }
         },
@@ -475,9 +457,7 @@
                 "code" : "0x60036002600182600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x03"
-                    ]
+                    "0x03" : "0x03"
                 }
             }
         },
@@ -520,9 +500,7 @@
                 "code" : "0x600460036002600183600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x04"
-                    ]
+                    "0x03" : "0x04"
                 }
             }
         },
@@ -565,9 +543,7 @@
                 "code" : "0x6005600460036002600184600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x05"
-                    ]
+                    "0x03" : "0x05"
                 }
             }
         },
@@ -610,9 +586,7 @@
                 "code" : "0x60066005600460036002600185600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x06"
-                    ]
+                    "0x03" : "0x06"
                 }
             }
         },
@@ -655,9 +629,7 @@
                 "code" : "0x600760066005600460036002600186600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x07"
-                    ]
+                    "0x03" : "0x07"
                 }
             }
         },
@@ -700,9 +672,7 @@
                 "code" : "0x6008600760066005600460036002600187600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x08"
-                    ]
+                    "0x03" : "0x08"
                 }
             }
         },
@@ -745,9 +715,7 @@
                 "code" : "0x60096008600760066005600460036002600188600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x09"
-                    ]
+                    "0x03" : "0x09"
                 }
             }
         },
@@ -790,9 +758,7 @@
                 "code" : "0x60ff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xff"
-                    ]
+                    "0x03" : "0xff"
                 }
             }
         },
@@ -835,9 +801,7 @@
                 "code" : "0x6966778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x66778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x66778899aabbccddeeff"
                 }
             }
         },
@@ -880,9 +844,7 @@
                 "code" : "0x6a5566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x5566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x5566778899aabbccddeeff"
                 }
             }
         },
@@ -925,9 +887,7 @@
                 "code" : "0x6b445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x445566778899aabbccddeeff"
                 }
             }
         },
@@ -970,9 +930,7 @@
                 "code" : "0x6c33445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x33445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x33445566778899aabbccddeeff"
                 }
             }
         },
@@ -1015,9 +973,7 @@
                 "code" : "0x6d2233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x2233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x2233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1060,9 +1016,7 @@
                 "code" : "0x6e112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1105,9 +1059,7 @@
                 "code" : "0x6f10112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x10112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x10112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1150,9 +1102,7 @@
                 "code" : "0x70ff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1195,9 +1145,7 @@
                 "code" : "0x71eeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1240,9 +1188,7 @@
                 "code" : "0x72ddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1285,9 +1231,7 @@
                 "code" : "0x61eeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xeeff"
-                    ]
+                    "0x03" : "0xeeff"
                 }
             }
         },
@@ -1330,9 +1274,7 @@
                 "code" : "0x73ccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1375,9 +1317,7 @@
                 "code" : "0x74bbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xbbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xbbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1420,9 +1360,7 @@
                 "code" : "0x75aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xaabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0xaabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1465,9 +1403,7 @@
                 "code" : "0x7699aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x99aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x99aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1510,9 +1446,7 @@
                 "code" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x8899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x8899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1555,9 +1489,7 @@
                 "code" : "0x78778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1600,9 +1532,7 @@
                 "code" : "0x7966778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x66778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x66778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1645,9 +1575,7 @@
                 "code" : "0x7a5566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1690,9 +1618,7 @@
                 "code" : "0x7b445566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1735,9 +1661,7 @@
                 "code" : "0x7c33445566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1780,9 +1704,7 @@
                 "code" : "0x62ddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xddeeff"
-                    ]
+                    "0x03" : "0xddeeff"
                 }
             }
         },
@@ -1825,9 +1747,7 @@
                 "code" : "0x7d2233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1870,9 +1790,7 @@
                 "code" : "0x7e112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -1915,9 +1833,7 @@
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
@@ -2002,9 +1918,7 @@
                 "code" : "0x63ccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xccddeeff"
-                    ]
+                    "0x03" : "0xccddeeff"
                 }
             }
         },
@@ -2047,9 +1961,7 @@
                 "code" : "0x64bbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xbbccddeeff"
-                    ]
+                    "0x03" : "0xbbccddeeff"
                 }
             }
         },
@@ -2092,9 +2004,7 @@
                 "code" : "0x65aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0xaabbccddeeff"
-                    ]
+                    "0x03" : "0xaabbccddeeff"
                 }
             }
         },
@@ -2137,9 +2047,7 @@
                 "code" : "0x6699aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x99aabbccddeeff"
-                    ]
+                    "0x03" : "0x99aabbccddeeff"
                 }
             }
         },
@@ -2182,9 +2090,7 @@
                 "code" : "0x678899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x8899aabbccddeeff"
-                    ]
+                    "0x03" : "0x8899aabbccddeeff"
                 }
             }
         },
@@ -2227,9 +2133,7 @@
                 "code" : "0x68778899aabbccddeeff600357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x778899aabbccddeeff"
-                    ]
+                    "0x03" : "0x778899aabbccddeeff"
                 }
             }
         },
@@ -2272,9 +2176,7 @@
                 "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039057",
                 "nonce" : "0",
                 "storage" : {
-                    "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" : [
-                        "0x03"
-                    ]
+                    "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" : "0x03"
                 }
             }
         },
@@ -2317,9 +2219,7 @@
                 "code" : "0x600a60096008600760066005600460036002600160039957",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0a" : [
-                        "0x01"
-                    ]
+                    "0x0a" : "0x01"
                 }
             }
         },
@@ -2362,9 +2262,7 @@
                 "code" : "0x600b600a60096008600760066005600460036002600160039a57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0b" : [
-                        "0x01"
-                    ]
+                    "0x0b" : "0x01"
                 }
             }
         },
@@ -2407,9 +2305,7 @@
                 "code" : "0x600c600b600a60096008600760066005600460036002600160039b57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0c" : [
-                        "0x01"
-                    ]
+                    "0x0c" : "0x01"
                 }
             }
         },
@@ -2452,9 +2348,7 @@
                 "code" : "0x600d600c600b600a60096008600760066005600460036002600160039c57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0d" : [
-                        "0x01"
-                    ]
+                    "0x0d" : "0x01"
                 }
             }
         },
@@ -2497,9 +2391,7 @@
                 "code" : "0x600e600d600c600b600a60096008600760066005600460036002600160039d57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0e" : [
-                        "0x01"
-                    ]
+                    "0x0e" : "0x01"
                 }
             }
         },
@@ -2542,9 +2434,7 @@
                 "code" : "0x600f600e600d600c600b600a60096008600760066005600460036002600160039e57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0f" : [
-                        "0x01"
-                    ]
+                    "0x0f" : "0x01"
                 }
             }
         },
@@ -2587,9 +2477,7 @@
                 "code" : "0x6010600f600e600d600c600b600a60096008600760066005600460036002600160039f57",
                 "nonce" : "0",
                 "storage" : {
-                    "0x10" : [
-                        "0x01"
-                    ]
+                    "0x10" : "0x01"
                 }
             }
         },
@@ -2632,9 +2520,7 @@
                 "code" : "0x6002600160039157",
                 "nonce" : "0",
                 "storage" : {
-                    "0x02" : [
-                        "0x01"
-                    ]
+                    "0x02" : "0x01"
                 }
             }
         },
@@ -2719,9 +2605,7 @@
                 "code" : "0x60036002600160039257",
                 "nonce" : "0",
                 "storage" : {
-                    "0x03" : [
-                        "0x01"
-                    ]
+                    "0x03" : "0x01"
                 }
             }
         },
@@ -2764,9 +2648,7 @@
                 "code" : "0x600460036002600160039357",
                 "nonce" : "0",
                 "storage" : {
-                    "0x04" : [
-                        "0x01"
-                    ]
+                    "0x04" : "0x01"
                 }
             }
         },
@@ -2809,9 +2691,7 @@
                 "code" : "0x6005600460036002600160039457",
                 "nonce" : "0",
                 "storage" : {
-                    "0x05" : [
-                        "0x01"
-                    ]
+                    "0x05" : "0x01"
                 }
             }
         },
@@ -2854,9 +2734,7 @@
                 "code" : "0x60066005600460036002600160039557",
                 "nonce" : "0",
                 "storage" : {
-                    "0x06" : [
-                        "0x01"
-                    ]
+                    "0x06" : "0x01"
                 }
             }
         },
@@ -2899,9 +2777,7 @@
                 "code" : "0x600760066005600460036002600160039657",
                 "nonce" : "0",
                 "storage" : {
-                    "0x07" : [
-                        "0x01"
-                    ]
+                    "0x07" : "0x01"
                 }
             }
         },
@@ -2944,9 +2820,7 @@
                 "code" : "0x6008600760066005600460036002600160039757",
                 "nonce" : "0",
                 "storage" : {
-                    "0x08" : [
-                        "0x01"
-                    ]
+                    "0x08" : "0x01"
                 }
             }
         },
@@ -2989,9 +2863,7 @@
                 "code" : "0x60096008600760066005600460036002600160039857",
                 "nonce" : "0",
                 "storage" : {
-                    "0x09" : [
-                        "0x01"
-                    ]
+                    "0x09" : "0x01"
                 }
             }
         },