mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: remove UNKNOWN type from OUTPUT_TYPES array

Browse Source 
This array contains the known active output types only.
And it's solely used to create/walk-through the active spkms.
This commit is contained in:
furszy committed 2022-08-18 16:47:15 -03:00
1 parent a8f69541ad
commit 5b4fdbbff5
2 files changed
-2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/outputtype.h
-1
View File
@@ -27,7 +27,6 @@ static constexpr auto OUTPUT_TYPES = std::array{
OutputType::P2SH_SEGWIT, OutputType::P2SH_SEGWIT,
OutputType::BECH32, OutputType::BECH32,
OutputType::BECH32M, OutputType::BECH32M,
OutputType::UNKNOWN,
}; };
std::optional<OutputType> ParseOutputType(const std::string& str); std::optional<OutputType> ParseOutputType(const std::string& str);
src/wallet/wallet.cpp
-1
View File
@@ -3433,7 +3433,6 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
for (bool internal : {false, true}) { for (bool internal : {false, true}) {
for (OutputType t : OUTPUT_TYPES) { for (OutputType t : OUTPUT_TYPES) {
if (t == OutputType::UNKNOWN) continue;
auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this)); auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this));
if (IsCrypted()) { if (IsCrypted()) {
if (IsLocked()) { if (IsLocked()) {