diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-06-27 14:53:27 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-01-23 16:35:06 -0500 |
| commit | 81610eddbc57c46ae243f45d73e715d509f53a6c (patch) | |
| tree | 71b0aec6274d7bcd7f8a985d76d7bfe5a653d223 | |
| parent | eb81fc3ee58d3e88af36d8091b9e4017a8603b3c (diff) | |
| download | bitcoin-81610eddbc57c46ae243f45d73e715d509f53a6c.tar.xz | |
List output types in an array in order to be iterated over
| -rw-r--r-- | src/outputtype.cpp | 2 | ||||
| -rw-r--r-- | src/outputtype.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 85ceb03aa6..71b5cba01c 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -19,6 +19,8 @@ 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 index b91082ddc0..1438f65844 100644 --- a/src/outputtype.h +++ b/src/outputtype.h @@ -10,6 +10,7 @@ #include <script/signingprovider.h> #include <script/standard.h> +#include <array> #include <string> #include <vector> @@ -27,6 +28,8 @@ enum class OutputType { CHANGE_AUTO, }; +extern const std::array<OutputType, 3> OUTPUT_TYPES; + NODISCARD bool ParseOutputType(const std::string& str, OutputType& output_type); const std::string& FormatOutputType(OutputType type); @@ -47,4 +50,3 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key); CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType); #endif // BITCOIN_OUTPUTTYPE_H - |