Page MenuHomePhabricator
Differential D465 Diff 1156 src/test/scriptflags.cpp

Changeset View

Standalone View

View Options

src/test/scriptflags.cpp

// Copyright (c) 2017 The Bitcoin developers // Copyright (c) 2017 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "test/scriptflags.h" #include "test/scriptflags.h"
#include "script/interpreter.h" #include "script/interpreter.h"
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <map> #include <map>
#include <vector> #include <vector>
static std::map<std::string, unsigned int> mapFlagNames = static std::map<std::string, unsigned int> mapFlagNames = {
boost::assign::map_list_of(std::string("NONE"), {std::string("NONE"), (unsigned int)SCRIPT_VERIFY_NONE},
deadalnixUnsubmitted
Not Done
Inline Actions

Is the std::string really necessary ?

deadalnix: Is the std::string really necessary ?
CCulianuAuthorUnsubmitted
Not Done
Inline Actions

No, it's not. Maybe it was for boos but for this initializer list it isn't. I'll change it -- it will be more readable. I don't think the casts are necessary either.

CCulianu: No, it's not. Maybe it was for boos but for this initializer list it isn't. I'll change it…
(unsigned int)SCRIPT_VERIFY_NONE)( {std::string("P2SH"), (unsigned int)SCRIPT_VERIFY_P2SH},
std::string("P2SH"), (unsigned int)SCRIPT_VERIFY_P2SH)( {std::string("STRICTENC"), (unsigned int)SCRIPT_VERIFY_STRICTENC},
std::string("STRICTENC"), (unsigned int)SCRIPT_VERIFY_STRICTENC)( {std::string("DERSIG"), (unsigned int)SCRIPT_VERIFY_DERSIG},
std::string("DERSIG"), (unsigned int)SCRIPT_VERIFY_DERSIG)( {std::string("LOW_S"), (unsigned int)SCRIPT_VERIFY_LOW_S},
std::string("LOW_S"), (unsigned int)SCRIPT_VERIFY_LOW_S)( {std::string("SIGPUSHONLY"), (unsigned int)SCRIPT_VERIFY_SIGPUSHONLY},
std::string("SIGPUSHONLY"), (unsigned int)SCRIPT_VERIFY_SIGPUSHONLY)( {std::string("MINIMALDATA"), (unsigned int)SCRIPT_VERIFY_MINIMALDATA},
std::string("MINIMALDATA"), (unsigned int)SCRIPT_VERIFY_MINIMALDATA)( {std::string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY},
std::string("NULLDUMMY"), (unsigned int)SCRIPT_VERIFY_NULLDUMMY)( {std::string("DISCOURAGE_UPGRADABLE_NOPS"),
std::string("DISCOURAGE_UPGRADABLE_NOPS"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS},
(unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS)( {std::string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK},
std::string("CLEANSTACK"), (unsigned int)SCRIPT_VERIFY_CLEANSTACK)( {std::string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF},
std::string("MINIMALIF"), (unsigned int)SCRIPT_VERIFY_MINIMALIF)( {std::string("NULLFAIL"), (unsigned int)SCRIPT_VERIFY_NULLFAIL},
std::string("NULLFAIL"), (unsigned int)SCRIPT_VERIFY_NULLFAIL)( {std::string("CHECKLOCKTIMEVERIFY"),
std::string("CHECKLOCKTIMEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY},
(unsigned int)SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)( {std::string("CHECKSEQUENCEVERIFY"),
std::string("CHECKSEQUENCEVERIFY"), (unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY},
(unsigned int)SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)( {std::string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"),
std::string("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"), (unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM},
(unsigned int)SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)( {std::string("COMPRESSED_PUBKEYTYPE"),
std::string("COMPRESSED_PUBKEYTYPE"), (unsigned int)SCRIPT_VERIFY_COMPRESSED_PUBKEYTYPE},
(unsigned int)SCRIPT_VERIFY_COMPRESSED_PUBKEYTYPE)( {std::string("SIGHASH_FORKID"),
std::string("SIGHASH_FORKID"), (unsigned int)SCRIPT_ENABLE_SIGHASH_FORKID}};
(unsigned int)SCRIPT_ENABLE_SIGHASH_FORKID);
unsigned int ParseScriptFlags(std::string strFlags) { unsigned int ParseScriptFlags(std::string strFlags) {
if (strFlags.empty()) { if (strFlags.empty()) {
return 0; return 0;
} }
unsigned int flags = 0; unsigned int flags = 0;
std::vector<std::string> words; std::vector<std::string> words;
boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(",")); boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(","));
Show All 25 Lines