Skip to content

Commit c3a8843

Browse files
l0rincl0rinc
committed
Use SCRIPT_VERIFY_NONE instead of hard-coded 0 in transaction_tests
1 parent 41544b8 commit c3a8843

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

‎src/test/transaction_tests.cpp

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,16 @@ static std::map<std::string, unsigned int> mapFlagNames = {
7272

7373
unsigned int ParseScriptFlags(std::string strFlags)
7474
{
75-
if (strFlags.empty() || strFlags == "NONE") return 0;
76-
unsigned int flags = 0;
77-
std::vector<std::string> words = SplitString(strFlags, ',');
75+
unsigned int flags = SCRIPT_VERIFY_NONE;
76+
if (strFlags.empty() || strFlags == "NONE") return flags;
7877

78+
std::vector<std::string> words = SplitString(strFlags, ',');
7979
for (const std::string& word : words)
8080
{
8181
if (!mapFlagNames.count(word))
8282
BOOST_ERROR("Bad test: unknown verification flag '" << word << "'");
8383
flags |= mapFlagNames[word];
8484
}
85-
8685
return flags;
8786
}
8887

@@ -98,7 +97,7 @@ bool CheckMapFlagNames()
9897

9998
std::string FormatScriptFlags(unsigned int flags)
10099
{
101-
if (flags == 0) {
100+
if (flags == SCRIPT_VERIFY_NONE) {
102101
return "";
103102
}
104103
std::string ret;
@@ -615,11 +614,11 @@ BOOST_AUTO_TEST_CASE(test_witness)
615614
// Normal pay-to-compressed-pubkey.
616615
CreateCreditAndSpend(keystore, scriptPubkey1, output1, input1);
617616
CreateCreditAndSpend(keystore, scriptPubkey2, output2, input2);
618-
CheckWithFlag(output1, input1, 0, true);
617+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
619618
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
620619
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
621620
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
622-
CheckWithFlag(output1, input2, 0, false);
621+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, false);
623622
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
624623
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
625624
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
@@ -628,23 +627,23 @@ BOOST_AUTO_TEST_CASE(test_witness)
628627
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(scriptPubkey1)), output1, input1);
629628
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(scriptPubkey2)), output2, input2);
630629
ReplaceRedeemScript(input2.vin[0].scriptSig, scriptPubkey1);
631-
CheckWithFlag(output1, input1, 0, true);
630+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
632631
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
633632
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
634633
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
635-
CheckWithFlag(output1, input2, 0, true);
634+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, true);
636635
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
637636
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
638637
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
639638

640639
// Witness pay-to-compressed-pubkey (v0).
641640
CreateCreditAndSpend(keystore, destination_script_1, output1, input1);
642641
CreateCreditAndSpend(keystore, destination_script_2, output2, input2);
643-
CheckWithFlag(output1, input1, 0, true);
642+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
644643
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
645644
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
646645
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
647-
CheckWithFlag(output1, input2, 0, true);
646+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, true);
648647
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
649648
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
650649
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
@@ -653,23 +652,23 @@ BOOST_AUTO_TEST_CASE(test_witness)
653652
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(destination_script_1)), output1, input1);
654653
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(destination_script_2)), output2, input2);
655654
ReplaceRedeemScript(input2.vin[0].scriptSig, destination_script_1);
656-
CheckWithFlag(output1, input1, 0, true);
655+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
657656
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
658657
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
659658
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
660-
CheckWithFlag(output1, input2, 0, true);
659+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, true);
661660
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, true);
662661
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
663662
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
664663

665664
// Normal pay-to-uncompressed-pubkey.
666665
CreateCreditAndSpend(keystore, scriptPubkey1L, output1, input1);
667666
CreateCreditAndSpend(keystore, scriptPubkey2L, output2, input2);
668-
CheckWithFlag(output1, input1, 0, true);
667+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
669668
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
670669
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
671670
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
672-
CheckWithFlag(output1, input2, 0, false);
671+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, false);
673672
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
674673
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
675674
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
@@ -678,11 +677,11 @@ BOOST_AUTO_TEST_CASE(test_witness)
678677
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(scriptPubkey1L)), output1, input1);
679678
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(scriptPubkey2L)), output2, input2);
680679
ReplaceRedeemScript(input2.vin[0].scriptSig, scriptPubkey1L);
681-
CheckWithFlag(output1, input1, 0, true);
680+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
682681
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, true);
683682
CheckWithFlag(output1, input1, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, true);
684683
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
685-
CheckWithFlag(output1, input2, 0, true);
684+
CheckWithFlag(output1, input2, SCRIPT_VERIFY_NONE, true);
686685
CheckWithFlag(output1, input2, SCRIPT_VERIFY_P2SH, false);
687686
CheckWithFlag(output1, input2, SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH, false);
688687
CheckWithFlag(output1, input2, STANDARD_SCRIPT_VERIFY_FLAGS, false);
@@ -697,19 +696,19 @@ BOOST_AUTO_TEST_CASE(test_witness)
697696

698697
// Normal 2-of-2 multisig
699698
CreateCreditAndSpend(keystore, scriptMulti, output1, input1, false);
700-
CheckWithFlag(output1, input1, 0, false);
699+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, false);
701700
CreateCreditAndSpend(keystore2, scriptMulti, output2, input2, false);
702-
CheckWithFlag(output2, input2, 0, false);
701+
CheckWithFlag(output2, input2, SCRIPT_VERIFY_NONE, false);
703702
BOOST_CHECK(*output1 == *output2);
704703
UpdateInput(input1.vin[0], CombineSignatures(input1, input2, output1));
705704
CheckWithFlag(output1, input1, STANDARD_SCRIPT_VERIFY_FLAGS, true);
706705

707706
// P2SH 2-of-2 multisig
708707
CreateCreditAndSpend(keystore, GetScriptForDestination(ScriptHash(scriptMulti)), output1, input1, false);
709-
CheckWithFlag(output1, input1, 0, true);
708+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
710709
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH, false);
711710
CreateCreditAndSpend(keystore2, GetScriptForDestination(ScriptHash(scriptMulti)), output2, input2, false);
712-
CheckWithFlag(output2, input2, 0, true);
711+
CheckWithFlag(output2, input2, SCRIPT_VERIFY_NONE, true);
713712
CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH, false);
714713
BOOST_CHECK(*output1 == *output2);
715714
UpdateInput(input1.vin[0], CombineSignatures(input1, input2, output1));
@@ -718,10 +717,10 @@ BOOST_AUTO_TEST_CASE(test_witness)
718717

719718
// Witness 2-of-2 multisig
720719
CreateCreditAndSpend(keystore, destination_script_multi, output1, input1, false);
721-
CheckWithFlag(output1, input1, 0, true);
720+
CheckWithFlag(output1, input1, SCRIPT_VERIFY_NONE, true);
722721
CheckWithFlag(output1, input1, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
723722
CreateCreditAndSpend(keystore2, destination_script_multi, output2, input2, false);
724-
CheckWithFlag(output2, input2, 0, true);
723+
CheckWithFlag(output2, input2, SCRIPT_VERIFY_NONE, true);
725724
CheckWithFlag(output2, input2, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS, false);
726725
BOOST_CHECK(*output1 == *output2);
727726
UpdateInput(input1.vin[0], CombineSignatures(input1, input2, output1));

0 commit comments

Comments
 (0)