diff options
| author | Pieter Wuille <[email protected]> | 2014-09-12 18:32:15 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-09-12 18:33:02 +0200 |
| commit | b9307d2f55710cfc5f74bbc68c7e8db8091677e8 (patch) | |
| tree | 1fc8d85d81f5e1a10d6ff1f8e47d6ff0ba028846 /src/test/transaction_tests.cpp | |
| parent | Merge pull request #4758 from theuni/osx-dmg-codesign-rebase (diff) | |
| parent | Make script_{valid,invalid}.json validation flags configurable (diff) | |
| download | discoin-b9307d2f55710cfc5f74bbc68c7e8db8091677e8.tar.xz discoin-b9307d2f55710cfc5f74bbc68c7e8db8091677e8.zip | |
Merge pull request #4876
6022b5d Make script_{valid,invalid}.json validation flags configurable (Pieter Wuille)
Diffstat (limited to 'src/test/transaction_tests.cpp')
| -rw-r--r-- | src/test/transaction_tests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 943568e89..21377395c 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); } |