Merge bitcoin/bitcoin#27473: bugfix: Properly handle "unknown" Address Type

achow101 · achow101 · commit 4ad20a225893 · 2023-04-17T10:18:04.000-04:00
0d6383f Don't return OutputType::UNKNOWN in ParseOutputType (Pttn) Pull request description: Fixes bitcoin/bitcoin#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 0d6383f MarcoFalke: lgtm ACK 0d6383f furszy: ACK bitcoin/bitcoin@0d6383f Tree-SHA512: 776793027b926283d3162e69fb9c8883c814b19bcce4574ccdf8e3140a1ec4ebc4aa8ccd1abae7ef3571f942d2e6c35305fd1244259540d90605106e01afc34c
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ std::optional<OutputType> ParseOutputType(const std::string& type)`
`32`	`32`	`return OutputType::BECH32;`
`33`	`33`	`} else if (type == OUTPUT_TYPE_STRING_BECH32M) {`
`34`	`34`	`return OutputType::BECH32M;`
`35`		`- } else if (type == OUTPUT_TYPE_STRING_UNKNOWN) {`
`36`		`- return OutputType::UNKNOWN;`
`37`	`35`	`}`
`38`	`36`	`return std::nullopt;`
`39`	`37`	`}`