Prettier VM tests.

1 files changed, 22 insertions, 888 deletions

diff --git a/vmtests.json b/vmtests.json
index 38550d112..605d0c018 100644
--- a/vmtests.json
+++ b/vmtests.json
@@ -2,8 +2,7 @@
     "arith" : {
         "callcreates" : [
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9770,
                 "value" : 74
@@ -20,59 +19,8 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : [
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                2,
-                96,
-                2,
-                96,
-                8,
-                3,
-                3,
-                96,
-                2,
-                96,
-                3,
-                6,
-                96,
-                2,
-                96,
-                2,
-                4,
-                96,
-                4,
-                96,
-                4,
-                96,
-                4,
-                2,
-                2,
-                96,
-                2,
-                96,
-                2,
-                1,
-                1,
-                1,
-                1,
-                1,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241
-            ],
-            "data" : [
-            ],
+            "code" : "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
+            "data" : "0x",
             "gas" : 10000,
             "gasPrice" : 100000000000000,
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
@@ -84,57 +32,7 @@
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 999999999999999926,
-                "code" : [
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    2,
-                    96,
-                    2,
-                    96,
-                    8,
-                    3,
-                    3,
-                    96,
-                    2,
-                    96,
-                    3,
-                    6,
-                    96,
-                    2,
-                    96,
-                    2,
-                    4,
-                    96,
-                    4,
-                    96,
-                    4,
-                    96,
-                    4,
-                    2,
-                    2,
-                    96,
-                    2,
-                    96,
-                    2,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241
-                ],
+                "code" : "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -143,57 +41,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
-                "code" : [
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    2,
-                    96,
-                    2,
-                    96,
-                    8,
-                    3,
-                    3,
-                    96,
-                    2,
-                    96,
-                    3,
-                    6,
-                    96,
-                    2,
-                    96,
-                    2,
-                    4,
-                    96,
-                    4,
-                    96,
-                    4,
-                    96,
-                    4,
-                    2,
-                    2,
-                    96,
-                    2,
-                    96,
-                    2,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241
-                ],
+                "code" : "0x600060006000600060026002600803036002600306600260020460046004600402026002600201010101013360c85c03f1",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -203,29 +51,25 @@
     "boolean" : {
         "callcreates" : [
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9786,
                 "value" : 2
             },
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9732,
                 "value" : 12
             },
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9696,
                 "value" : 13
             },
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9660,
                 "value" : 14
@@ -242,218 +86,8 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : [
-                96,
-                1,
-                96,
-                1,
-                16,
-                15,
-                96,
-                26,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                2,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                1,
-                16,
-                15,
-                96,
-                52,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                3,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                0,
-                16,
-                15,
-                96,
-                78,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                4,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                0,
-                16,
-                15,
-                96,
-                104,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                5,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                1,
-                17,
-                15,
-                96,
-                130,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                12,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                1,
-                17,
-                15,
-                96,
-                156,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                13,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                1,
-                96,
-                0,
-                17,
-                15,
-                96,
-                182,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                14,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80,
-                96,
-                0,
-                96,
-                0,
-                17,
-                15,
-                96,
-                208,
-                89,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                15,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241,
-                80
-            ],
-            "data" : [
-            ],
+            "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
+            "data" : "0x",
             "gas" : 10000,
             "gasPrice" : 100000000000000,
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
@@ -465,216 +99,7 @@
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 999999999999999959,
-                "code" : [
-                    96,
-                    1,
-                    96,
-                    1,
-                    16,
-                    15,
-                    96,
-                    26,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    2,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    1,
-                    16,
-                    15,
-                    96,
-                    52,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    3,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    0,
-                    16,
-                    15,
-                    96,
-                    78,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    4,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    0,
-                    16,
-                    15,
-                    96,
-                    104,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    5,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    1,
-                    17,
-                    15,
-                    96,
-                    130,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    12,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    1,
-                    17,
-                    15,
-                    96,
-                    156,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    13,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    0,
-                    17,
-                    15,
-                    96,
-                    182,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    14,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    0,
-                    17,
-                    15,
-                    96,
-                    208,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    15,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80
-                ],
+                "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -683,216 +108,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
-                "code" : [
-                    96,
-                    1,
-                    96,
-                    1,
-                    16,
-                    15,
-                    96,
-                    26,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    2,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    1,
-                    16,
-                    15,
-                    96,
-                    52,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    3,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    0,
-                    16,
-                    15,
-                    96,
-                    78,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    4,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    0,
-                    16,
-                    15,
-                    96,
-                    104,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    5,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    1,
-                    17,
-                    15,
-                    96,
-                    130,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    12,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    1,
-                    17,
-                    15,
-                    96,
-                    156,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    13,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    1,
-                    96,
-                    0,
-                    17,
-                    15,
-                    96,
-                    182,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    14,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80,
-                    96,
-                    0,
-                    96,
-                    0,
-                    17,
-                    15,
-                    96,
-                    208,
-                    89,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    15,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241,
-                    80
-                ],
+                "code" : "0x60016001100f601a59600060006000600060023360c85c03f15060006001100f603459600060006000600060033360c85c03f15060016000100f604e59600060006000600060043360c85c03f15060006000100f606859600060006000600060053360c85c03f15060016001110f6082596000600060006000600c3360c85c03f15060006001110f609c596000600060006000600d3360c85c03f15060016000110f60b6596000600060006000600e3360c85c03f15060006000110f60d0596000600060006000600f3360c85c03f150",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -902,8 +118,7 @@
     "mktx" : {
         "callcreates" : [
             {
-                "data" : [
-                ],
+                "data" : "0x",
                 "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
                 "gasLimit" : 9792,
                 "value" : 500000000000000000
@@ -920,33 +135,8 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : [
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                96,
-                0,
-                103,
-                6,
-                240,
-                91,
-                89,
-                211,
-                178,
-                0,
-                0,
-                51,
-                96,
-                200,
-                92,
-                3,
-                241
-            ],
-            "data" : [
-            ],
+            "code" : "0x60006000600060006706f05b59d3b200003360c85c03f1",
+            "data" : "0x",
             "gas" : 10000,
             "gasPrice" : 100000000000000,
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
@@ -958,31 +148,7 @@
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 500000000000000000,
-                "code" : [
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    103,
-                    6,
-                    240,
-                    91,
-                    89,
-                    211,
-                    178,
-                    0,
-                    0,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241
-                ],
+                "code" : "0x60006000600060006706f05b59d3b200003360c85c03f1",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -991,31 +157,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
-                "code" : [
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    96,
-                    0,
-                    103,
-                    6,
-                    240,
-                    91,
-                    89,
-                    211,
-                    178,
-                    0,
-                    0,
-                    51,
-                    96,
-                    200,
-                    92,
-                    3,
-                    241
-                ],
+                "code" : "0x60006000600060006706f05b59d3b200003360c85c03f1",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -1036,12 +178,8 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : [
-                160,
-                112
-            ],
-            "data" : [
-            ],
+            "code" : "0x10f9",
+            "data" : "0x",
             "gas" : 10000,
             "gasPrice" : 100000000000000,
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
@@ -1053,8 +191,7 @@
         "post" : {
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : 1000000000000000000,
-                "code" : [
-                ],
+                "code" : "0x",
                 "nonce" : 0,
                 "storage" : {
                 }
@@ -1063,10 +200,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : 1000000000000000000,
-                "code" : [
-                    51,
-                    255
-                ],
+                "code" : "0x33ff",
                 "nonce" : 0,
                 "storage" : {
                 }