Skip to content

Commit 3b0ec43

Browse files
vbuterinvbuterin
committed
Merge pull request #15 from CJentzsch/develop
corrected tests and different style for storage
2 parents aec3252 + 222068b commit 3b0ec43

8 files changed

+253
-649
lines changed

‎vmtests/vmArithmeticTest.json

Lines changed: 43 additions & 129 deletions
Large diffs are not rendered by default.

‎vmtests/vmBitwiseLogicOperationTest.json

Lines changed: 32 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
"code" : "0x60026002600114600057",
2929
"nonce" : "0",
3030
"storage" : {
31-
"0x" : [
32-
"0x01"
33-
]
31+
"0x" : "0x01"
3432
}
3533
}
3634
},
@@ -73,9 +71,7 @@
7371
"code" : "0x60026002600003600160000314600057",
7472
"nonce" : "0",
7573
"storage" : {
76-
"0x" : [
77-
"0x01"
78-
]
74+
"0x" : "0x01"
7975
}
8076
}
8177
},
@@ -118,9 +114,7 @@
118114
"code" : "0x60036001600660000314600057",
119115
"nonce" : "0",
120116
"storage" : {
121-
"0x" : [
122-
"0x02"
123-
]
117+
"0x" : "0x02"
124118
}
125119
}
126120
},
@@ -205,9 +199,7 @@
205199
"code" : "0x6003600160066000031460036005600003060e600057",
206200
"nonce" : "0",
207201
"storage" : {
208-
"0x" : [
209-
"0x01"
210-
]
202+
"0x" : "0x01"
211203
}
212204
}
213205
},
@@ -250,9 +242,7 @@
250242
"code" : "0x60036000036001600414600057",
251243
"nonce" : "0",
252244
"storage" : {
253-
"0x" : [
254-
"0x05"
255-
]
245+
"0x" : "0x05"
256246
}
257247
}
258248
},
@@ -337,9 +327,7 @@
337327
"code" : "0x6002600210600057",
338328
"nonce" : "0",
339329
"storage" : {
340-
"0x" : [
341-
"0x02"
342-
]
330+
"0x" : "0x02"
343331
}
344332
}
345333
},
@@ -424,9 +412,7 @@
424412
"code" : "0x6001600310600057",
425413
"nonce" : "0",
426414
"storage" : {
427-
"0x" : [
428-
"0x01"
429-
]
415+
"0x" : "0x01"
430416
}
431417
}
432418
},
@@ -469,9 +455,7 @@
469455
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff10600057",
470456
"nonce" : "0",
471457
"storage" : {
472-
"0x" : [
473-
"0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
474-
]
458+
"0x" : "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
475459
}
476460
}
477461
},
@@ -514,9 +498,7 @@
514498
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057",
515499
"nonce" : "0",
516500
"storage" : {
517-
"0x" : [
518-
"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
519-
]
501+
"0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
520502
}
521503
}
522504
},
@@ -559,9 +541,7 @@
559541
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057",
560542
"nonce" : "0",
561543
"storage" : {
562-
"0x" : [
563-
"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
564-
]
544+
"0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
565545
}
566546
}
567547
},
@@ -604,9 +584,7 @@
604584
"code" : "0x6780402010080402016000601f0313600057",
605585
"nonce" : "0",
606586
"storage" : {
607-
"0x" : [
608-
"0x01"
609-
]
587+
"0x" : "0x01"
610588
}
611589
}
612590
},
@@ -649,9 +627,7 @@
649627
"code" : "0x6780402010080402016001601f0313600057",
650628
"nonce" : "0",
651629
"storage" : {
652-
"0x" : [
653-
"0x02"
654-
]
630+
"0x" : "0x02"
655631
}
656632
}
657633
},
@@ -778,9 +754,7 @@
778754
"code" : "0x6780402010080402016002601f0313600057",
779755
"nonce" : "0",
780756
"storage" : {
781-
"0x" : [
782-
"0x04"
783-
]
757+
"0x" : "0x04"
784758
}
785759
}
786760
},
@@ -823,9 +797,7 @@
823797
"code" : "0x6780402010080402016003601f0313600057",
824798
"nonce" : "0",
825799
"storage" : {
826-
"0x" : [
827-
"0x08"
828-
]
800+
"0x" : "0x08"
829801
}
830802
}
831803
},
@@ -868,9 +840,7 @@
868840
"code" : "0x6780402010080402016004601f0313600057",
869841
"nonce" : "0",
870842
"storage" : {
871-
"0x" : [
872-
"0x10"
873-
]
843+
"0x" : "0x10"
874844
}
875845
}
876846
},
@@ -913,9 +883,7 @@
913883
"code" : "0x6780402010080402016005601f0313600057",
914884
"nonce" : "0",
915885
"storage" : {
916-
"0x" : [
917-
"0x20"
918-
]
886+
"0x" : "0x20"
919887
}
920888
}
921889
},
@@ -958,9 +926,7 @@
958926
"code" : "0x6780402010080402016006601f0313600057",
959927
"nonce" : "0",
960928
"storage" : {
961-
"0x" : [
962-
"0x40"
963-
]
929+
"0x" : "0x40"
964930
}
965931
}
966932
},
@@ -1003,9 +969,7 @@
1003969
"code" : "0x6780402010080402016007601f0313600057",
1004970
"nonce" : "0",
1005971
"storage" : {
1006-
"0x" : [
1007-
"0x80"
1008-
]
972+
"0x" : "0x80"
1009973
}
1010974
}
1011975
},
@@ -1216,9 +1180,7 @@
12161180
"code" : "0x60036001600560000315600057",
12171181
"nonce" : "0",
12181182
"storage" : {
1219-
"0x" : [
1220-
"0x02"
1221-
]
1183+
"0x" : "0x02"
12221184
}
12231185
}
12241186
},
@@ -1303,9 +1265,7 @@
13031265
"code" : "0x6003600160056000031560036005600003060e600057",
13041266
"nonce" : "0",
13051267
"storage" : {
1306-
"0x" : [
1307-
"0x01"
1308-
]
1268+
"0x" : "0x01"
13091269
}
13101270
}
13111271
},
@@ -1348,9 +1308,7 @@
13481308
"code" : "0x60036000036001600515600057",
13491309
"nonce" : "0",
13501310
"storage" : {
1351-
"0x" : [
1352-
"0x05"
1353-
]
1311+
"0x" : "0x05"
13541312
}
13551313
}
13561314
},
@@ -1435,9 +1393,7 @@
14351393
"code" : "0x6002600211600057",
14361394
"nonce" : "0",
14371395
"storage" : {
1438-
"0x" : [
1439-
"0x02"
1440-
]
1396+
"0x" : "0x02"
14411397
}
14421398
}
14431399
},
@@ -1480,9 +1436,7 @@
14801436
"code" : "0x6001600211600057",
14811437
"nonce" : "0",
14821438
"storage" : {
1483-
"0x" : [
1484-
"0x03"
1485-
]
1439+
"0x" : "0x03"
14861440
}
14871441
}
14881442
},
@@ -1525,9 +1479,7 @@
15251479
"code" : "0x6001600311600057",
15261480
"nonce" : "0",
15271481
"storage" : {
1528-
"0x" : [
1529-
"0x03"
1530-
]
1482+
"0x" : "0x03"
15311483
}
15321484
}
15331485
},
@@ -1570,9 +1522,7 @@
15701522
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff11600057",
15711523
"nonce" : "0",
15721524
"storage" : {
1573-
"0x" : [
1574-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
1575-
]
1525+
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
15761526
}
15771527
}
15781528
},
@@ -1615,9 +1565,7 @@
16151565
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057",
16161566
"nonce" : "0",
16171567
"storage" : {
1618-
"0x" : [
1619-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
1620-
]
1568+
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
16211569
}
16221570
}
16231571
},
@@ -1660,9 +1608,7 @@
16601608
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057",
16611609
"nonce" : "0",
16621610
"storage" : {
1663-
"0x" : [
1664-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
1665-
]
1611+
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
16661612
}
16671613
}
16681614
},
@@ -1747,9 +1693,7 @@
17471693
"code" : "0x6001600212600057",
17481694
"nonce" : "0",
17491695
"storage" : {
1750-
"0x" : [
1751-
"0x03"
1752-
]
1696+
"0x" : "0x03"
17531697
}
17541698
}
17551699
},
@@ -1792,9 +1736,7 @@
17921736
"code" : "0x6001600312600057",
17931737
"nonce" : "0",
17941738
"storage" : {
1795-
"0x" : [
1796-
"0x02"
1797-
]
1739+
"0x" : "0x02"
17981740
}
17991741
}
18001742
},
@@ -1837,9 +1779,7 @@
18371779
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12600057",
18381780
"nonce" : "0",
18391781
"storage" : {
1840-
"0x" : [
1841-
"0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
1842-
]
1782+
"0x" : "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
18431783
}
18441784
}
18451785
},
@@ -1882,9 +1822,7 @@
18821822
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057",
18831823
"nonce" : "0",
18841824
"storage" : {
1885-
"0x" : [
1886-
"0x1111111111111111111111111111111111111111111111111111111111111111"
1887-
]
1825+
"0x" : "0x1111111111111111111111111111111111111111111111111111111111111111"
18881826
}
18891827
}
18901828
},
@@ -1927,9 +1865,7 @@
19271865
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057",
19281866
"nonce" : "0",
19291867
"storage" : {
1930-
"0x" : [
1931-
"0x1111111111111111111111111111101111111111111111111111111111111111"
1932-
]
1868+
"0x" : "0x1111111111111111111111111111101111111111111111111111111111111111"
19331869
}
19341870
}
19351871
},

0 commit comments

Comments
 (0)