diff options
| author | Andrew Chow <github@achow101.com> | 2023-04-17 10:13:50 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-04-17 10:18:04 -0400 |
| commit | 4ad20a2258935d48dd972cb72bc9030d875164b5 (patch) | |
| tree | 1eadb8a19d7c1c4b4cb7f07096539f64bc4ede34 | |
| parent | e054b7390ca9498c6c2bbc775c8af9f8e94c52dd (diff) | |
| parent | 0d6383fda04a99726654945a737bbb1369e0e44a (diff) | |
| download | bitcoin-4ad20a2258935d48dd972cb72bc9030d875164b5.tar.xz | |
Merge bitcoin/bitcoin#27473: bugfix: Properly handle "unknown" Address Type
0d6383fda04a99726654945a737bbb1369e0e44a Don't return OutputType::UNKNOWN in ParseOutputType (Pttn)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/issues/27472 by also handling at the relevant places the case where ParseOutputType returns `OutputType::UNKNOWN`, and not just when it returns `std::nullopt`.
ACKs for top commit:
achow101:
ACK 0d6383fda04a99726654945a737bbb1369e0e44a
MarcoFalke:
lgtm ACK 0d6383fda04a99726654945a737bbb1369e0e44a
furszy:
ACK https://github.com/bitcoin/bitcoin/commit/0d6383fda04a99726654945a737bbb1369e0e44a
Tree-SHA512: 776793027b926283d3162e69fb9c8883c814b19bcce4574ccdf8e3140a1ec4ebc4aa8ccd1abae7ef3571f942d2e6c35305fd1244259540d90605106e01afc34c
| -rw-r--r-- | src/outputtype.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 270212dca5..9a3870d8dc 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -32,8 +32,6 @@ std::optional<OutputType> ParseOutputType(const std::string& type) return OutputType::BECH32; } else if (type == OUTPUT_TYPE_STRING_BECH32M) { return OutputType::BECH32M; - } else if (type == OUTPUT_TYPE_STRING_UNKNOWN) { - return OutputType::UNKNOWN; } return std::nullopt; } |