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

MarcoFalke · MarcoFalke · commit fa39cdd072c9 · 2021-01-03T18:37:59.000+01:00
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
@@ -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_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)
 {
     if (type == OUTPUT_TYPE_STRING_LEGACY) {
diff --git a/src/outputtype.h b/src/outputtype.h
@@ -20,7 +20,11 @@ enum class OutputType {
     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);
 const std::string& FormatOutputType(OutputType type);

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ static const std::string OUTPUT_TYPE_STRING_LEGACY = "legacy";`
`19`	`19`	`static const std::string OUTPUT_TYPE_STRING_P2SH_SEGWIT = "p2sh-segwit";`
`20`	`20`	`static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32";`
`21`	`21`
`22`		`-const std::array<OutputType, 3> OUTPUT_TYPES = {OutputType::LEGACY, OutputType::P2SH_SEGWIT, OutputType::BECH32};`
`23`		`-`
`24`	`22`	`bool ParseOutputType(const std::string& type, OutputType& output_type)`
`25`	`23`	`{`
`26`	`24`	`if (type == OUTPUT_TYPE_STRING_LEGACY) {`