diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index cc115008442..d98a6d12a9f 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -1317,7 +1317,7 @@ bool LegacyScriptPubKeyMan::TopUp(unsigned int kpSize) return false; } } - if (!batch.TxnCommit()) throw std::runtime_error(strprintf("Error during keypool top up. Cannot commit changes for wallet %s", m_storage.GetDisplayName())); + if (!batch.TxnCommit()) throw std::runtime_error(strprintf("Error during keypool top up. Cannot commit changes for wallet [%s]", m_storage.LogName())); NotifyCanGetAddressesChanged(); // Note: Unlike with DescriptorSPKM, LegacySPKM does not need to call // m_storage.TopUpCallback() as we do not know what new scripts the LegacySPKM is @@ -2230,7 +2230,7 @@ bool DescriptorScriptPubKeyMan::TopUp(unsigned int size) WalletBatch batch(m_storage.GetDatabase()); if (!batch.TxnBegin()) return false; bool res = TopUpWithDB(batch, size); - if (!batch.TxnCommit()) throw std::runtime_error(strprintf("Error during descriptors keypool top up. Cannot commit changes for wallet %s", m_storage.GetDisplayName())); + if (!batch.TxnCommit()) throw std::runtime_error(strprintf("Error during descriptors keypool top up. Cannot commit changes for wallet [%s]", m_storage.LogName())); return res; } diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 9b62a35beda..83eac5d0329 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -43,7 +43,7 @@ class WalletStorage { public: virtual ~WalletStorage() = default; - virtual std::string GetDisplayName() const = 0; + virtual std::string LogName() const = 0; virtual WalletDatabase& GetDatabase() const = 0; virtual bool IsWalletFlagSet(uint64_t) const = 0; virtual void UnsetBlankWalletFlag(WalletBatch&) = 0; @@ -257,7 +257,7 @@ public: template void WalletLogPrintf(util::ConstevalFormatString wallet_fmt, const Params&... params) const { - LogInfo("%s %s", m_storage.GetDisplayName(), tfm::format(wallet_fmt, params...)); + LogInfo("[%s] %s", m_storage.LogName(), tfm::format(wallet_fmt, params...)); }; /** Watch-only address added */ diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 4c7e55bd4b3..943733b215d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -922,14 +922,14 @@ public: /** Determine if we are a legacy wallet */ bool IsLegacy() const; - /** Returns a bracketed wallet name for displaying in logs, will return [default wallet] if the wallet has no name */ - std::string GetDisplayName() const override + /** Return wallet name for use in logs, will return "default wallet" if the wallet has no name. */ + std::string LogName() const override { - std::string wallet_name = GetName().length() == 0 ? "default wallet" : GetName(); - return strprintf("[%s]", wallet_name); + std::string name{GetName()}; + return name.empty() ? "default wallet" : name; }; - /** Return wallet name for display, translating "default wallet" string if returned. */ + /** Return wallet name for display, like LogName() but translates "default wallet" string. */ std::string DisplayName() const { std::string name{GetName()}; @@ -940,7 +940,7 @@ public: template void WalletLogPrintf(util::ConstevalFormatString wallet_fmt, const Params&... params) const { - LogInfo("%s %s", GetDisplayName(), tfm::format(wallet_fmt, params...)); + LogInfo("[%s] %s", LogName(), tfm::format(wallet_fmt, params...)); }; /** Upgrade the wallet */