aboutsummaryrefslogtreecommitdiff
path: root/src/test/script_tests.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2015-02-05 21:26:15 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2015-02-06 11:17:29 -0800
commit6690ef7fea5ae7785809e04fc6de3995b0dfae17 (patch)
treea3fc6fde09c3d286648ef607e08d446c8d4b7914 /src/test/script_tests.cpp
parentda7ba593d74e7a09599d4b7df5ecccd79a3a1c64 (diff)
Backport of some of BIP66's tests
Diffstat (limited to 'src/test/script_tests.cpp')
-rw-r--r--src/test/script_tests.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 5d5a1525f7..ee81dbcdc2 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -142,8 +142,13 @@ BOOST_AUTO_TEST_CASE(script_valid)
string scriptPubKeyString = test[1].get_str();
CScript scriptPubKey = ParseScript(scriptPubKeyString);
+ int flagsNow = flags;
+ if (test.size() > 3 && ("," + test[2].get_str() + ",").find(",DERSIG,") != string::npos) {
+ flagsNow |= SCRIPT_VERIFY_DERSIG;
+ }
+
CTransaction tx;
- BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, tx, 0, flags, SIGHASH_NONE), strTest);
+ BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, tx, 0, flagsNow, SIGHASH_NONE), strTest);
}
}
@@ -166,8 +171,13 @@ BOOST_AUTO_TEST_CASE(script_invalid)
string scriptPubKeyString = test[1].get_str();
CScript scriptPubKey = ParseScript(scriptPubKeyString);
+ int flagsNow = flags;
+ if (test.size() > 3 && ("," + test[2].get_str() + ",").find(",DERSIG,") != string::npos) {
+ flagsNow |= SCRIPT_VERIFY_DERSIG;
+ }
+
CTransaction tx;
- BOOST_CHECK_MESSAGE(!VerifyScript(scriptSig, scriptPubKey, tx, 0, flags, SIGHASH_NONE), strTest);
+ BOOST_CHECK_MESSAGE(!VerifyScript(scriptSig, scriptPubKey, tx, 0, flagsNow, SIGHASH_NONE), strTest);
}
}