Add op csv tests to script_tests.json #7994

pull Christewart wants to merge 1 commits into bitcoin:master from Christewart:add_op_csv_tests changing 1 files +10 −1

Christewart commented at 2:20 PM on May 3, 2016: member

Adds OP_CHECKSEQUENCEVERIFY tests to script_tests.json

in src/script/script.cpp:None in d1fd054051 outdated

 131 | @@ -132,7 +132,8 @@ const char* GetOpName(opcodetype opcode)
 132 |      // expanson
 133 |      case OP_NOP1                   : return "OP_NOP1";
 134 |      case OP_CHECKLOCKTIMEVERIFY    : return "OP_CHECKLOCKTIMEVERIFY";
 135 | -    case OP_NOP3                   : return "OP_NOP3";
 136 | +    case OP_CHECKSEQUENCEVERIFY    : return "OP_CHECKSEQUENCEVERIFY"; 
 137 | +    //case OP_NOP3                   : return "OP_NOP3";

instagibbs commented at 2:21 PM on May 3, 2016:

delete this line

btcdrak commented at 2:34 PM on May 3, 2016: contributor

You can add extra tests, as was commented on #7540, renaming isn't appropriate until the softfork activated, since it's still a NOP at the moment.

in src/script/script.cpp:None in 1cf4c885c2 outdated

 131 | @@ -132,7 +132,7 @@ const char* GetOpName(opcodetype opcode)
 132 |      // expanson
 133 |      case OP_NOP1                   : return "OP_NOP1";
 134 |      case OP_CHECKLOCKTIMEVERIFY    : return "OP_CHECKLOCKTIMEVERIFY";
 135 | -    case OP_NOP3                   : return "OP_NOP3";
 136 | +    case OP_NOP3                   : return "OP_NOP3";

fanquake commented at 11:50 AM on May 4, 2016:

Looks like you've added a space to the end of this line?

in src/test/data/script_tests.json:None in 1cf4c885c2 outdated

 231 | @@ -232,8 +232,8 @@
 232 |  ["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC", "OK"],
 233 |  
 234 |  
 235 | -["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"],
 236 | -["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC", "OK"],
 237 | +["1", "NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"],

instagibbs commented at 6:44 PM on May 4, 2016:

more extra spaces here and one line below

laanwj commented at 10:13 AM on May 10, 2016: member

ACK after squash
laanwj added the label Tests on May 10, 2016
MarcoFalke commented at 12:40 PM on May 10, 2016: member

@Christewart There is a tutorial written on how to squash, if you need help: https://github.com/fanquake/bitcoin/blob/90963e53707cf244e6a2a804341e9280628b0c34/CONTRIBUTING.md#squashing-commits

Adding basic tests for OP_CSV inside of script_tests.json

Changing NOP3 op name to OP_CHECKSEQUENCEVERIFY, renaming instances of OP_NOP3 in script_tests.json to CHECKSEQUENCEVERIFY

Cleaning up NOP3 comment

Re-adding test cases that were accidentally deleted, removing dupicated test case, fixing formatting

Removing re-labeling of OP_NOP3 to OP_CSV

Fixing whitespace issues

10e83d7956

Christewart force-pushed on May 11, 2016
sipa merged this on May 16, 2016
sipa closed this on May 16, 2016
sipa referenced this in commit 1f01443567 on May 16, 2016
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels