Skip to content

G
Geth-Modification
Commit e1f5e12a authored by Gav Wood's avatar Gav Wood
Browse files
Options

Fix RLP tests.

parent f87ce15a
Hide whitespace changes
Inline Side-by-side
Showing with 808 additions and 284 deletions
rlptest.json
View file @ e1f5e12a
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
}, },
"shortstring": { "shortstring": {
"in": "dog", "in": "dog",
"out": "43646f67" "out": "83646f67"
}, },
"longstring": { "longstring": {
"in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit", "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit",
"out": "TODO" "out": "b8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974"
}, },
"zero": { "zero": {
"in": 0, "in": 0,
...@@ -23,24 +23,24 @@ ...@@ -23,24 +23,24 @@
"in": 1000, "in": 1000,
"out": "8203e8" "out": "8203e8"
}, },
"bigint": { "emptylist": {
"in": 115792089237316195423570985008687907853269984665640564039457584007913129639936,
"out": "3821010000000000000000000000000000000000000000000000000000000000000000"
},
"emptylist": {
"in": [], "in": [],
"out": "c0" "out": "c0"
}, },
"stringlist": { "stringlist": {
"in": [ "dog", "god", "cat" ], "in": [ "dog", "god", "cat" ],
"out": "8343646f6743676f6443636174" "out": "cc83646f6783676f6483636174"
}, },
"multilist": { "multilist": {
"in": [ "zw", [ 4 ], 1 ], "in": [ "zw", [ 4 ], 1 ],
"out": "TODO" "out": "c6827a77c10401"
}, },
"listsoflists": { "listsoflists": {
"in": [ [ [], [] ], [] ], "in": [ [ [], [] ], [] ],
"out": "c2c2c0c0c0" "out": "c4c2c0c0c0"
} },
"xbigint": {
"in": 115792089237316195423570985008687907853269984665640564039457584007913129639936,
"out": "3821010000000000000000000000000000000000000000000000000000000000000000"
}
} }
vmtests.json
View file @ e1f5e12a
{ {
"fan" : { "arith" : {
"env" : { "env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256", "currentDifficulty" : "256",
"currentTimestamp" : 1, "currentTimestamp" : 1,
"feeMultiplier" : 1, "feeMultiplier" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae" "previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
}, },
"exec" : [ "exec" : [
{ {
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"data" : [ "data" : [
"0xcd1722f3947def4cf144679da39c4c32bdc35681", ],
"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
], "value" : 1000000000000000000
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681", }
"value" : 1000000000000000000 ],
} "post" : {
], "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"post" : { "balance" : 999999999999999810,
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "extroPrice" : 0,
"balance" : "115792089237316195423570985008687907853269984665640564039456684007913129639415", "nonce" : 1,
"extroPrice" : 0, "store" : {
"nonce" : 2, "0" : [
"store" : { 48,
"0" : [ 0,
48, 48,
8, 2,
48, 48,
100000000000000000, 2,
18, 1,
12, 48,
57, 4,
0, 48,
19, 4,
48, 2,
100000000000000000, 48,
18, 4,
3, 2,
4, 1,
48, 48,
"53545048851664692004060005546177757518248266694338929000325674008596820525056", 2,
55, 48,
48, 2,
0, 4,
48, 1,
"47492849101242970779199036819969649705442767148016637594308774690745619578880", 48,
55, 3,
48, 48,
53, 2,
19, 6,
48, 1,
"47492849101242970779199036819969649705442767148016637594308774690745619578880", 48,
54, 8,
10, 48,
15, 2,
57, 3,
48, 48,
0, 2,
48, 3,
"53545048851664692004060005546177757518248266694338929000325674008596820525056", 1,
54, 17,
48, 61,
"47492849101242970779199036819969649705442767148016637594308774690745619578880", 0
54, ]
20, }
61, }
48, },
1, "pre" : {
48, "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "balance" : 1000000000000000000,
54, "extroPrice" : 0,
1, "nonce" : 0,
48, "store" : {
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "0" : [
55, 48,
48, 0,
22, 48,
56, 2,
0 48,
], 2,
"47492849101242970779199036819969649705442767148016637594308774690745619578880" : [ 1,
2 48,
], 4,
"53545048851664692004060005546177757518248266694338929000325674008596820525056" : [ 48,
450000000000000000 4,
] 2,
} 48,
} 4,
}, 2,
"pre" : { 1,
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 48,
"balance" : 0, 2,
"extroPrice" : 0, 48,
"nonce" : 0, 2,
"store" : { 4,
"0" : [ 1,
48, 48,
8, 3,
48, 48,
100000000000000000, 2,
18, 6,
12, 1,
57, 48,
0, 8,
19, 48,
48, 2,
100000000000000000, 3,
18, 48,
3, 2,
4, 3,
48, 1,
"53545048851664692004060005546177757518248266694338929000325674008596820525056", 17,
55, 61
48, ]
0, }
48, }
"47492849101242970779199036819969649705442767148016637594308774690745619578880", },
55, "txs" : [
48, {
53, "data" : [
19, ],
48, "destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "value" : 79
54, }
10, ]
15, },
57, "boolean" : {
48, "env" : {
0, "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
48, "currentDifficulty" : "256",
"53545048851664692004060005546177757518248266694338929000325674008596820525056", "currentTimestamp" : 1,
54, "feeMultiplier" : 1,
48, "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
54, },
20, "exec" : [
61, {
48, "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
1, "data" : [
48, ],
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
54, "value" : 1000000000000000000
1, }
48, ],
"47492849101242970779199036819969649705442767148016637594308774690745619578880", "post" : {
55, "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
48, "balance" : 999999999999999490,
22, "extroPrice" : 0,
56 "nonce" : 4,
] "store" : {
} "0" : [
} 48,
}, 21,
"txs" : [ 48,
{ 0,
"data" : [ 48,
], 13,
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", 48,
"value" : 450000000000000000 1,
}, 15,
{ 57,
"data" : [ 49,
], 48,
"destination" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", 1,
"value" : 450000000000000000 15,
} 57,
] 48,
}, 0,
"mktx" : { 48,
"env" : { 2,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", 17,
"currentDifficulty" : "256", 61,
"currentTimestamp" : 1, 48,
"feeMultiplier" : 1, 42,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", 48,
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae" 0,
}, 48,
"exec" : [ 34,
{ 48,
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", 1,
"data" : [ 15,
], 57,
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681", 49,
"value" : 1000000000000000000 48,
} 0,
], 15,
"post" : { 57,
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 48,
"balance" : 499999999999999900, 0,
"extroPrice" : 0, 48,
"nonce" : 1, 3,
"store" : { 17,
"0" : [ 61,
48, 48,
0, 63,
48, 48,
500000000000000000, 0,
17, 48,
61, 55,
0 48,
] 0,
} 15,
} 57,
}, 49,
"pre" : { 48,
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 1,
"balance" : 1000000000000000000, 15,
"extroPrice" : 0, 57,
"nonce" : 0, 48,
"store" : { 0,
"0" : [ 48,
48, 4,
0, 17,
48, 61,
500000000000000000, 48,
17, 84,
61 48,
] 0,
} 48,
} 76,
}, 48,
"txs" : [ 0,
{ 15,
"data" : [ 57,
], 49,
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681", 48,
"value" : 500000000000000000 0,
} 15,
] 57,
}, 48,
"suicide" : { 0,
"env" : { 48,
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", 5,
"currentDifficulty" : "256", 17,
"currentTimestamp" : 1, 61,
"feeMultiplier" : 1, 48,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", 104,
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae" 48,
}, 1,
"exec" : [ 48,
{ 96,
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", 48,
"data" : [ 1,
], 57,
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681", 49,
"value" : 1000000000000000000 48,
} 1,
], 15,
"post" : { 57,
"cd1722f3947def4cf144679da39c4c32bdc35681" : { 48,
"balance" : 1000000000000000010, 0,
"extroPrice" : 0, 48,
"nonce" : 0 12,
} 17,
}, 61,
"pre" : { 48,
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { 124,
"balance" : 1000000000000000000, 48,
"extroPrice" : 0, 1,
"nonce" : 0, 48,
"store" : { 116,
"0" : [ 48,
17, 1,
63 57,
] 49,
} 48,
} 0,
}, 15,
"txs" : [ 57,
] 48,
} 0,
48,
13,
17,
61,
48,
144,
48,
1,
48,
136,
48,
0,
57,
49,
48,
1,
15,
57,
48,
0,
48,
14,
17,
61,
48,
164,
48,
1,
48,
156,
48,
0,
57,
49,
48,
0,
15,
57,
48,
0,
48,
15,
17,
61,
0
]
}
}
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"extroPrice" : 0,
"nonce" : 0,
"store" : {
"0" : [
48,
21,
48,
0,
48,
13,
48,
1,
15,
57,
49,
48,
1,
15,
57,
48,
0,
48,
2,
17,
61,
48,
42,
48,
0,
48,
34,
48,
1,
15,
57,
49,
48,
0,
15,
57,
48,
0,
48,
3,
17,
61,
48,
63,
48,
0,
48,
55,
48,
0,
15,
57,
49,
48,
1,
15,
57,
48,
0,
48,
4,
17,
61,
48,
84,
48,
0,
48,
76,
48,
0,
15,
57,
49,
48,
0,
15,
57,
48,
0,
48,
5,
17,
61,
48,
104,
48,
1,
48,
96,
48,
1,
57,
49,
48,
1,
15,
57,
48,
0,
48,
12,
17,
61,
48,
124,
48,
1,
48,
116,
48,
1,
57,
49,
48,
0,
15,
57,
48,
0,
48,
13,
17,
61,
48,
144,
48,
1,
48,
136,
48,
0,
57,
49,
48,
1,
15,
57,
48,
0,
48,
14,
17,
61,
48,
164,
48,
1,
48,
156,
48,
0,
57,
49,
48,
0,
15,
57,
48,
0,
48,
15,
17,
61
]
}
}
},
"txs" : [
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 2
},
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 12
},
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 13
},
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 14
}
]
},
"fan" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"feeMultiplier" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"data" : [
"0xcd1722f3947def4cf144679da39c4c32bdc35681",
"0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
],
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000
}
],
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "115792089237316195423570985008687907853269984665640564039456684007913129639415",
"extroPrice" : 0,
"nonce" : 2,
"store" : {
"0" : [
48,
8,
48,
100000000000000000,
18,
12,
57,
0,
19,
48,
100000000000000000,
18,
3,
4,
48,
"53545048851664692004060005546177757518248266694338929000325674008596820525056",
55,
48,
0,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
55,
48,
53,
19,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
10,
15,
57,
48,
0,
48,
"53545048851664692004060005546177757518248266694338929000325674008596820525056",
54,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
20,
61,
48,
1,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
1,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
55,
48,
22,
56,
0
],
"47492849101242970779199036819969649705442767148016637594308774690745619578880" : [
2
],
"53545048851664692004060005546177757518248266694338929000325674008596820525056" : [
450000000000000000
]
}
}
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 0,
"extroPrice" : 0,
"nonce" : 0,
"store" : {
"0" : [
48,
8,
48,
100000000000000000,
18,
12,
57,
0,
19,
48,
100000000000000000,
18,
3,
4,
48,
"53545048851664692004060005546177757518248266694338929000325674008596820525056",
55,
48,
0,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
55,
48,
53,
19,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
10,
15,
57,
48,
0,
48,
"53545048851664692004060005546177757518248266694338929000325674008596820525056",
54,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
20,
61,
48,
1,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
54,
1,
48,
"47492849101242970779199036819969649705442767148016637594308774690745619578880",
55,
48,
22,
56
]
}
}
},
"txs" : [
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 450000000000000000
},
{
"data" : [
],
"destination" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"value" : 450000000000000000
}
]
},
"mktx" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"feeMultiplier" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"data" : [
],
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000
}
],
"post" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 499999999999999900,
"extroPrice" : 0,
"nonce" : 1,
"store" : {
"0" : [
48,
0,
48,
500000000000000000,
17,
61,
0
]
}
}
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"extroPrice" : 0,
"nonce" : 0,
"store" : {
"0" : [
48,
0,
48,
500000000000000000,
17,
61
]
}
}
},
"txs" : [
{
"data" : [
],
"destination" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 500000000000000000
}
]
},
"suicide" : {
"env" : {
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentTimestamp" : 1,
"feeMultiplier" : 1,
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
"previousNonce" : "9c9c6567b5ec0c5f3f25df79be42707090f1e62e9db84cbb556ae2a2f6ccccae"
},
"exec" : [
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"data" : [
],
"sender" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : 1000000000000000000
}
],
"post" : {
"cd1722f3947def4cf144679da39c4c32bdc35681" : {
"balance" : 1000000000000000010,
"extroPrice" : 0,
"nonce" : 0
}
},
"pre" : {
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : 1000000000000000000,
"extroPrice" : 0,
"nonce" : 0,
"store" : {
"0" : [
17,
63
]
}
}
},
"txs" : [
]
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment