diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-20 15:23:05 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-20 15:27:39 +0100 |
commit | 3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8 (patch) | |
tree | 0e5d1d4782c4405ff5d7a9cb806853e5428a1f1b /src/test/transaction_tests.cpp | |
parent | cf9c4887f176634c9f39305ad70657d9fff3962d (diff) | |
parent | 03914234b3c9c35d66b51d580fe727a0707394ca (diff) | |
download | bitcoin-3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8.tar.xz |
Merge pull request #5000
0391423 Discourage NOPs reserved for soft-fork upgrades (Peter Todd)
Diffstat (limited to 'src/test/transaction_tests.cpp')
-rw-r--r-- | src/test/transaction_tests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index bf3a60c04f..e939e89972 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -37,7 +37,8 @@ static std::map<string, unsigned int> mapFlagNames = boost::assign::map_list_of (string("LOW_S"), (unsigned int)SCRIPT_VERIFY_LOW_S) (string("SIGPUSHONLY"), (unsigned int)SCRIPT_VERIFY_SIGPUSHONLY) (string("MINIMALDATA"), (unsigned int)SCRIPT_VERIFY_MINIMALDATA) - (string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY); + (string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY) + (string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS); unsigned int ParseScriptFlags(string strFlags) { |