Skip to content

Commit 7194128

Browse files
committed
merge bitcoin#25790: improve {LoadActive,Deactivate}ScriptPubKeyMan log
1 parent d0a8bf4 commit 7194128

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/wallet/wallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3850,7 +3850,7 @@ void CWallet::LoadActiveScriptPubKeyMan(uint256 id, bool internal)
38503850
// Legacy wallets have only one ScriptPubKeyManager and it's active for all output and change types.
38513851
Assert(IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
38523852

3853-
WalletLogPrintf("Setting spkMan to active: id = %s, type = %d, internal = %d\n", id.ToString(), static_cast<int>(OutputType::LEGACY), static_cast<int>(internal));
3853+
WalletLogPrintf("Setting spkMan to active: id = %s, type = %s, internal = %s\n", id.ToString(), FormatOutputType(OutputType::LEGACY), internal ? "true" : "false");
38543854
auto& spk_mans = internal ? m_internal_spk_managers : m_external_spk_managers;
38553855
auto& spk_mans_other = internal ? m_external_spk_managers : m_internal_spk_managers;
38563856
auto spk_man = m_spk_managers.at(id).get();
@@ -3868,7 +3868,7 @@ void CWallet::DeactivateScriptPubKeyMan(uint256 id, bool internal)
38683868
{
38693869
auto spk_man = GetScriptPubKeyMan(internal);
38703870
if (spk_man != nullptr && spk_man->GetID() == id) {
3871-
WalletLogPrintf("Deactivate spkMan: id = %s, type = %d, internal = %d\n", id.ToString(), static_cast<int>(OutputType::LEGACY), static_cast<int>(internal));
3871+
WalletLogPrintf("Deactivate spkMan: id = %s, type = %s, internal = %s\n", id.ToString(), FormatOutputType(OutputType::LEGACY), internal ? "true" : "false");
38723872
WalletBatch batch(GetDatabase());
38733873
if (!batch.EraseActiveScriptPubKeyMan(internal)) {
38743874
throw std::runtime_error(std::string(__func__) + ": erasing active ScriptPubKeyMan id failed");

0 commit comments

Comments
 (0)