highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-03 11:43:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use C++17 std::array deduction for OUTPUT_TYPES

Browse Source
This commit is contained in:
MarcoFalke 2020-12-26 12:40:37 +01:00
parent 2dab2d239a
commit fa39cdd072
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/outputtype.cpp
View File

@ -19,8 +19,6 @@ static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";
static const std::string OUTPUT_TYPE_STRING_P2SH_SEGWIT = "p2sh-segwit"; static const std::string OUTPUT_TYPE_STRING_P2SH_SEGWIT = "p2sh-segwit";
static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32"; static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32";
const std::array<OutputType, 3> OUTPUT_TYPES = {OutputType::LEGACY, OutputType::P2SH_SEGWIT, OutputType::BECH32};
bool ParseOutputType(const std::string& type, OutputType& output_type) bool ParseOutputType(const std::string& type, OutputType& output_type)
{ {
if (type == OUTPUT_TYPE_STRING_LEGACY) { if (type == OUTPUT_TYPE_STRING_LEGACY) {

6
src/outputtype.h
View File

@ -20,7 +20,11 @@ enum class OutputType {
BECH32, BECH32,
}; };
extern const std::array<OutputType, 3> OUTPUT_TYPES; static constexpr auto OUTPUT_TYPES = std::array{
OutputType::LEGACY,
OutputType::P2SH_SEGWIT,
OutputType::BECH32,
};
[[nodiscard]] bool ParseOutputType(const std::string& str, OutputType& output_type); [[nodiscard]] bool ParseOutputType(const std::string& str, OutputType& output_type);
const std::string& FormatOutputType(OutputType type); const std::string& FormatOutputType(OutputType type);