From fa4395dffd432b999002dfd24eb6f8d7384fbcbe Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 12 Mar 2024 21:37:01 +0100 Subject: [PATCH] refactor: Remove unused LogPrintf --- doc/developer-notes.md | 3 +-- src/logging.h | 3 --- src/test/logging_tests.cpp | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 106533b72d3..d17f8024ee4 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -752,8 +752,7 @@ logging messages. They should be used as follows: messages or for infrequent and important events such as a new block tip being found or a new outbound connection being made. These log messages are unconditional, so care must be taken that they can't be used by an - attacker to fill up storage. Note that `LogPrintf(fmt, params...)` is - a deprecated alias for `LogInfo`. + attacker to fill up storage. - `LogError(fmt, params...)` should be used in place of `LogInfo` for severe problems that require the node (or a subsystem) to shut down diff --git a/src/logging.h b/src/logging.h index defff61d300..4a6f1d1659c 100644 --- a/src/logging.h +++ b/src/logging.h @@ -369,9 +369,6 @@ inline void LogPrintFormatInternal(std::source_location&& source_loc, BCLog::Log #define LogWarning(...) LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Warning, /*should_ratelimit=*/true, __VA_ARGS__) #define LogError(...) LogPrintLevel_(BCLog::LogFlags::ALL, BCLog::Level::Error, /*should_ratelimit=*/true, __VA_ARGS__) -// Deprecated unconditional logging. -#define LogPrintf(...) LogInfo(__VA_ARGS__) - // Use a macro instead of a function for conditional logging to prevent // evaluating arguments when logging for the category is not enabled. diff --git a/src/test/logging_tests.cpp b/src/test/logging_tests.cpp index 692d3eda729..42658e940a7 100644 --- a/src/test/logging_tests.cpp +++ b/src/test/logging_tests.cpp @@ -142,15 +142,13 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintStr, LogSetup) BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacrosDeprecated, LogSetup) { LogInstance().EnableCategory(BCLog::NET); - LogInfo("foo5: %s\n", "bar5"); LogPrintLevel(BCLog::NET, BCLog::Level::Trace, "foo4: %s\n", "bar4"); // not logged LogPrintLevel(BCLog::NET, BCLog::Level::Debug, "foo7: %s\n", "bar7"); LogPrintLevel(BCLog::NET, BCLog::Level::Info, "foo8: %s\n", "bar8"); LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "foo9: %s\n", "bar9"); LogPrintLevel(BCLog::NET, BCLog::Level::Error, "foo10: %s\n", "bar10"); std::vector log_lines{ReadDebugLogLines()}; - std::vector expected = { - "foo5: bar5", + std::vector expected{ "[net] foo7: bar7", "[net:info] foo8: bar8", "[net:warning] foo9: bar9",