BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More CScript unit tests.

This commit is contained in:
Gavin Andresen 2012-05-24 13:29:08 -04:00
parent b92095f18c
commit f04017f702
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/data/script_invalid.json
View File

@ -10,7 +10,7 @@
["2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "], ["2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "],
["-2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "], ["-2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "],
["2147483647 DUP ADD", "4294967294 NUMEQUAL", "NUMEQUAL must be in numeric range"], ["2147483647 DUP ADD", "4294967294 NUMEQUAL", "NUMEQUAL must be in numeric range"],
["0xaabbccddeeff NOT", "0 EQUAL", "NOT is an arithmetic operand"], ["'abcdef' NOT", "0 EQUAL", "NOT is an arithmetic operand"],
["2 DUP MUL", "4 EQUAL", "disabled"], ["2 DUP MUL", "4 EQUAL", "disabled"],
["2 DUP DIV", "1 EQUAL", "disabled"], ["2 DUP DIV", "1 EQUAL", "disabled"],
@ -20,6 +20,10 @@
["2 2 LSHIFT", "8 EQUAL", "disabled"], ["2 2 LSHIFT", "8 EQUAL", "disabled"],
["2 1 RSHIFT", "1 EQUAL", "disabled"], ["2 1 RSHIFT", "1 EQUAL", "disabled"],
["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL"],
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL"],
["0x50","1", "opcode 0x50 is reserved"],
["NOP1","NOP10"] ["NOP1","NOP10"]
] ]

10
src/test/data/script_valid.json
View File

@ -1,4 +1,12 @@
[ [
["0x4c0107","7 EQUAL", "0x4c is OP_PUSHDATA1"],
["0x4d010008","8 EQUAL", "0x4d is OP_PUSHDATA2"],
["0x4e0100000009","9 EQUAL", "0x4e is OP_PUSHDATA4"],
["0x4c00","0 EQUAL"],
["0x4d0000","0 EQUAL"],
["0x4e00000000","0 EQUAL"],
["2 -2 ADD", "0 EQUAL"], ["2 -2 ADD", "0 EQUAL"],
["2147483647 -2147483647 ADD", "0 EQUAL"], ["2147483647 -2147483647 ADD", "0 EQUAL"],
["-1 -1 ADD", "-2 EQUAL"], ["-1 -1 ADD", "-2 EQUAL"],
@ -73,6 +81,8 @@
["2147483647 DUP ADD", "4294967294 EQUAL", ">32 bit EQUAL is valid"], ["2147483647 DUP ADD", "4294967294 EQUAL", ">32 bit EQUAL is valid"],
["2147483647 NEGATE DUP ADD", "-4294967294 EQUAL"], ["2147483647 NEGATE DUP ADD", "-4294967294 EQUAL"],
["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL"],
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL"],
["NOP","1"] ["NOP","1"]
] ]

12
src/test/script_tests.cpp
View File

@ -59,13 +59,15 @@ ParseScript(string s)
} }
else if (starts_with(w, "0x") && IsHex(string(w.begin()+2, w.end()))) else if (starts_with(w, "0x") && IsHex(string(w.begin()+2, w.end())))
{ {
// Hex data: // Raw hex data, inserted NOT pushed onto stack:
result << ParseHex(string(w.begin()+2, w.end())); std::vector<unsigned char> raw = ParseHex(string(w.begin()+2, w.end()));
result.insert(result.end(), raw.begin(), raw.end());
} }
else if (s.size() >= 2 && starts_with(w, "'") && ends_with(w, "'")) else if (w.size() >= 2 && starts_with(w, "'") && ends_with(w, "'"))
{ {
// Single-quoted string, pushed as data: // Single-quoted string, pushed as data. NOTE: this is poor-man's
std::vector<unsigned char> value(s.begin()+1, s.end()-1); // parsing, spaces/tabs/newlines in single-quoted strings won't work.
std::vector<unsigned char> value(w.begin()+1, w.end()-1);
result << value; result << value;
} }
else if (mapOpNames.count(w)) else if (mapOpNames.count(w))