aboutsummaryrefslogtreecommitdiff
path: root/src/test/transaction_tests.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-09-08 21:15:31 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2014-09-08 22:38:26 +0200
commit6022b5dc6ba930797db46e00426923b53d6594b3 (patch)
tree6b10b6a20bfff8190ffc6d8f22457403edb6956e /src/test/transaction_tests.cpp
parenteecd3c0fb0625b036f68a7830dda8edde21fcb90 (diff)
Make script_{valid,invalid}.json validation flags configurable
Diffstat (limited to 'src/test/transaction_tests.cpp')
-rw-r--r--src/test/transaction_tests.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 943568e89d..21377395cf 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -26,7 +26,7 @@ using namespace boost::algorithm;
// In script_tests.cpp
extern Array read_json(const std::string& jsondata);
-unsigned int ParseFlags(string strFlags){
+unsigned int ParseScriptFlags(string strFlags){
unsigned int flags = 0;
vector<string> words;
split(words, strFlags, is_any_of(","));
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
break;
}
- unsigned int verify_flags = ParseFlags(test[2].get_str());
+ unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
BOOST_CHECK_MESSAGE(VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
tx, i, verify_flags, 0),
strTest);
@@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
break;
}
- unsigned int verify_flags = ParseFlags(test[2].get_str());
+ unsigned int verify_flags = ParseScriptFlags(test[2].get_str());
fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout],
tx, i, verify_flags, 0);
}