Skip to content

Commit

Permalink
Merge pull request #15 from CJentzsch/develop
Browse files Browse the repository at this point in the history 
corrected tests and different style for storage
  • Loading branch information
@vbuterin
vbuterin committed Oct 7, 2014
2 parents aec3252 + 222068b commit 3b0ec43
Show file tree
Hide file tree
Showing 8 changed files with 253 additions and 649 deletions.
172 changes: 43 additions & 129 deletions vmtests/vmArithmeticTest.json
View file

Large diffs are not rendered by default.

128 changes: 32 additions & 96 deletions vmtests/vmBitwiseLogicOperationTest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
"code" : "0x60026002600114600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -73,9 +71,7 @@
"code" : "0x60026002600003600160000314600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -118,9 +114,7 @@
"code" : "0x60036001600660000314600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -205,9 +199,7 @@
"code" : "0x6003600160066000031460036005600003060e600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -250,9 +242,7 @@
"code" : "0x60036000036001600414600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x05"
]
"0x" : "0x05"
}
}
},
Expand Down Expand Up @@ -337,9 +327,7 @@
"code" : "0x6002600210600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -424,9 +412,7 @@
"code" : "0x6001600310600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -469,9 +455,7 @@
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff10600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
]
"0x" : "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
}
}
},
Expand Down Expand Up @@ -514,9 +498,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
]
"0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
}
}
},
Expand Down Expand Up @@ -559,9 +541,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee10600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
]
"0x" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
}
}
},
Expand Down Expand Up @@ -604,9 +584,7 @@
"code" : "0x6780402010080402016000601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -649,9 +627,7 @@
"code" : "0x6780402010080402016001601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -778,9 +754,7 @@
"code" : "0x6780402010080402016002601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x04"
]
"0x" : "0x04"
}
}
},
Expand Down Expand Up @@ -823,9 +797,7 @@
"code" : "0x6780402010080402016003601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x08"
]
"0x" : "0x08"
}
}
},
Expand Down Expand Up @@ -868,9 +840,7 @@
"code" : "0x6780402010080402016004601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x10"
]
"0x" : "0x10"
}
}
},
Expand Down Expand Up @@ -913,9 +883,7 @@
"code" : "0x6780402010080402016005601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x20"
]
"0x" : "0x20"
}
}
},
Expand Down Expand Up @@ -958,9 +926,7 @@
"code" : "0x6780402010080402016006601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x40"
]
"0x" : "0x40"
}
}
},
Expand Down Expand Up @@ -1003,9 +969,7 @@
"code" : "0x6780402010080402016007601f0313600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x80"
]
"0x" : "0x80"
}
}
},
Expand Down Expand Up @@ -1216,9 +1180,7 @@
"code" : "0x60036001600560000315600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -1303,9 +1265,7 @@
"code" : "0x6003600160056000031560036005600003060e600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x01"
]
"0x" : "0x01"
}
}
},
Expand Down Expand Up @@ -1348,9 +1308,7 @@
"code" : "0x60036000036001600515600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x05"
]
"0x" : "0x05"
}
}
},
Expand Down Expand Up @@ -1435,9 +1393,7 @@
"code" : "0x6002600211600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -1480,9 +1436,7 @@
"code" : "0x6001600211600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x03"
]
"0x" : "0x03"
}
}
},
Expand Down Expand Up @@ -1525,9 +1479,7 @@
"code" : "0x6001600311600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x03"
]
"0x" : "0x03"
}
}
},
Expand Down Expand Up @@ -1570,9 +1522,7 @@
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff11600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
}
}
},
Expand Down Expand Up @@ -1615,9 +1565,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
}
}
},
Expand Down Expand Up @@ -1660,9 +1608,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee11600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
}
}
},
Expand Down Expand Up @@ -1747,9 +1693,7 @@
"code" : "0x6001600212600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x03"
]
"0x" : "0x03"
}
}
},
Expand Down Expand Up @@ -1792,9 +1736,7 @@
"code" : "0x6001600312600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x02"
]
"0x" : "0x02"
}
}
},
Expand Down Expand Up @@ -1837,9 +1779,7 @@
"code" : "0x7f0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
]
"0x" : "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
}
}
},
Expand Down Expand Up @@ -1882,9 +1822,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x1111111111111111111111111111111111111111111111111111111111111111"
]
"0x" : "0x1111111111111111111111111111111111111111111111111111111111111111"
}
}
},
Expand Down Expand Up @@ -1927,9 +1865,7 @@
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7feeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee12600057",
"nonce" : "0",
"storage" : {
"0x" : [
"0x1111111111111111111111111111101111111111111111111111111111111111"
]
"0x" : "0x1111111111111111111111111111101111111111111111111111111111111111"
}
}
},
Expand Down
Loading

0 comments on commit 3b0ec43

Please sign in to comment.