Enable Wswitch for OutputType

This commit is contained in:
MarcoFalke
2020-06-27 11:05:03 -04:00
parent faddad71f6
commit fa927ff884
2 changed files with 8 additions and 8 deletions

View File

@@ -42,8 +42,8 @@ const std::string& FormatOutputType(OutputType type)
case OutputType::LEGACY: return OUTPUT_TYPE_STRING_LEGACY; case OutputType::LEGACY: return OUTPUT_TYPE_STRING_LEGACY;
case OutputType::P2SH_SEGWIT: return OUTPUT_TYPE_STRING_P2SH_SEGWIT; case OutputType::P2SH_SEGWIT: return OUTPUT_TYPE_STRING_P2SH_SEGWIT;
case OutputType::BECH32: return OUTPUT_TYPE_STRING_BECH32; case OutputType::BECH32: return OUTPUT_TYPE_STRING_BECH32;
default: assert(false); } // no default case, so the compiler can warn about missing cases
} assert(false);
} }
CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type) CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type)
@@ -61,8 +61,8 @@ CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type)
return witdest; return witdest;
} }
} }
default: assert(false); } // no default case, so the compiler can warn about missing cases
} assert(false);
} }
std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key) std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
@@ -100,6 +100,6 @@ CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore,
return ScriptHash(witprog); return ScriptHash(witprog);
} }
} }
default: assert(false); } // no default case, so the compiler can warn about missing cases
} assert(false);
} }

View File

@@ -1900,8 +1900,8 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_
desc_prefix = "wpkh(" + xpub + "/84'"; desc_prefix = "wpkh(" + xpub + "/84'";
break; break;
} }
default: assert(false); } // no default case, so the compiler can warn about missing cases
} assert(!desc_prefix.empty());
// Mainnet derives at 0', testnet and regtest derive at 1' // Mainnet derives at 0', testnet and regtest derive at 1'
if (Params().IsTestChain()) { if (Params().IsTestChain()) {