kernel: add missing log levels and categories

Ensure all levels and categories that may be logged by kernel code
are well defined. Necessary preparation for future work to move
from string-based to struct-based logging.

Author: stickies-v

src/kernel/bitcoinkernel.cpp

@@ -149,18 +149,19 @@ struct btck_BlockValidationState : Handle<btck_BlockValidationState, BlockValida
 
 namespace {
 
-
 struct LogLevelMapping {
     util::log::Level bclog;
     std::string_view name;
 };
 
 // Single source of truth for log level mappings (indexed by btck_LogLevel)
 constexpr auto LOG_LEVELS = [] {
-    std::array<LogLevelMapping, 3> a{};
+    std::array<LogLevelMapping, 5> a{};
     a[btck_LogLevel_TRACE] = {util::log::Level::Trace, "trace"};
     a[btck_LogLevel_DEBUG] = {util::log::Level::Debug, "debug"};
     a[btck_LogLevel_INFO] = {util::log::Level::Info, "info"};
+    a[btck_LogLevel_WARNING] = {util::log::Level::Warning, "warning"};
+    a[btck_LogLevel_ERROR] = {util::log::Level::Error, "error"};
     return a;
 }();
 
@@ -177,18 +178,20 @@ struct LogCategoryMapping {
 
 // Single source of truth for log category mappings (indexed by btck_LogCategory)
 constexpr auto LOG_CATEGORIES = [] {
-    std::array<LogCategoryMapping, 11> a{};
+    std::array<LogCategoryMapping, 13> a{};
     a[btck_LogCategory_ALL] = {BCLog::LogFlags::ALL, "all"};
     a[btck_LogCategory_BENCH] = {BCLog::LogFlags::BENCH, "bench"};
     a[btck_LogCategory_BLOCKSTORAGE] = {BCLog::LogFlags::BLOCKSTORAGE, "blockstorage"};
     a[btck_LogCategory_COINDB] = {BCLog::LogFlags::COINDB, "coindb"};
+    a[btck_LogCategory_ESTIMATEFEE] = {BCLog::LogFlags::ESTIMATEFEE, "estimatefee"};
+    a[btck_LogCategory_KERNEL] = {BCLog::LogFlags::KERNEL, "kernel"};
     a[btck_LogCategory_LEVELDB] = {BCLog::LogFlags::LEVELDB, "leveldb"};
     a[btck_LogCategory_MEMPOOL] = {BCLog::LogFlags::MEMPOOL, "mempool"};
     a[btck_LogCategory_PRUNE] = {BCLog::LogFlags::PRUNE, "prune"};
     a[btck_LogCategory_RAND] = {BCLog::LogFlags::RAND, "rand"};
     a[btck_LogCategory_REINDEX] = {BCLog::LogFlags::REINDEX, "reindex"};
+    a[btck_LogCategory_TXPACKAGES] = {BCLog::LogFlags::TXPACKAGES, "txpackages"};
     a[btck_LogCategory_VALIDATION] = {BCLog::LogFlags::VALIDATION, "validation"};
-    a[btck_LogCategory_KERNEL] = {BCLog::LogFlags::KERNEL, "kernel"};
     return a;
 }();
 

src/kernel/bitcoinkernel.h

@@ -436,13 +436,15 @@ typedef uint8_t btck_LogCategory;
 #define btck_LogCategory_BENCH ((btck_LogCategory)(1))
 #define btck_LogCategory_BLOCKSTORAGE ((btck_LogCategory)(2))
 #define btck_LogCategory_COINDB ((btck_LogCategory)(3))
-#define btck_LogCategory_LEVELDB ((btck_LogCategory)(4))
-#define btck_LogCategory_MEMPOOL ((btck_LogCategory)(5))
-#define btck_LogCategory_PRUNE ((btck_LogCategory)(6))
-#define btck_LogCategory_RAND ((btck_LogCategory)(7))
-#define btck_LogCategory_REINDEX ((btck_LogCategory)(8))
-#define btck_LogCategory_VALIDATION ((btck_LogCategory)(9))
-#define btck_LogCategory_KERNEL ((btck_LogCategory)(10))
+#define btck_LogCategory_ESTIMATEFEE ((btck_LogCategory)(4))
+#define btck_LogCategory_KERNEL ((btck_LogCategory)(5))
+#define btck_LogCategory_LEVELDB ((btck_LogCategory)(6))
+#define btck_LogCategory_MEMPOOL ((btck_LogCategory)(7))
+#define btck_LogCategory_PRUNE ((btck_LogCategory)(8))
+#define btck_LogCategory_RAND ((btck_LogCategory)(9))
+#define btck_LogCategory_REINDEX ((btck_LogCategory)(10))
+#define btck_LogCategory_TXPACKAGES ((btck_LogCategory)(11))
+#define btck_LogCategory_VALIDATION ((btck_LogCategory)(12))
 
 /**
  * The level at which logs should be produced.
@@ -451,6 +453,8 @@ typedef uint8_t btck_LogLevel;
 #define btck_LogLevel_TRACE ((btck_LogLevel)(0))
 #define btck_LogLevel_DEBUG ((btck_LogLevel)(1))
 #define btck_LogLevel_INFO ((btck_LogLevel)(2))
+#define btck_LogLevel_WARNING ((btck_LogLevel)(3))
+#define btck_LogLevel_ERROR ((btck_LogLevel)(4))
 
 /**
  * Options controlling the format of log messages.

src/kernel/bitcoinkernel_wrapper.h

@@ -27,19 +27,23 @@ enum class LogCategory : btck_LogCategory {
     BENCH = btck_LogCategory_BENCH,
     BLOCKSTORAGE = btck_LogCategory_BLOCKSTORAGE,
     COINDB = btck_LogCategory_COINDB,
+    ESTIMATEFEE = btck_LogCategory_ESTIMATEFEE,
+    KERNEL = btck_LogCategory_KERNEL,
     LEVELDB = btck_LogCategory_LEVELDB,
     MEMPOOL = btck_LogCategory_MEMPOOL,
     PRUNE = btck_LogCategory_PRUNE,
     RAND = btck_LogCategory_RAND,
     REINDEX = btck_LogCategory_REINDEX,
+    TXPACKAGES = btck_LogCategory_TXPACKAGES,
     VALIDATION = btck_LogCategory_VALIDATION,
-    KERNEL = btck_LogCategory_KERNEL
 };
 
 enum class LogLevel : btck_LogLevel {
     TRACE_LEVEL = btck_LogLevel_TRACE,
     DEBUG_LEVEL = btck_LogLevel_DEBUG,
-    INFO_LEVEL = btck_LogLevel_INFO
+    INFO_LEVEL = btck_LogLevel_INFO,
+    WARNING_LEVEL = btck_LogLevel_WARNING,
+    ERROR_LEVEL = btck_LogLevel_ERROR,
 };
 
 enum class ChainType : btck_ChainType {

src/test/kernel/test_kernel.cpp

@@ -640,6 +640,8 @@ BOOST_AUTO_TEST_CASE(log_level_name_tests)
     BOOST_CHECK_EQUAL(log_level_get_name(LogLevel::TRACE_LEVEL), "trace");
     BOOST_CHECK_EQUAL(log_level_get_name(LogLevel::DEBUG_LEVEL), "debug");
     BOOST_CHECK_EQUAL(log_level_get_name(LogLevel::INFO_LEVEL), "info");
+    BOOST_CHECK_EQUAL(log_level_get_name(LogLevel::WARNING_LEVEL), "warning");
+    BOOST_CHECK_EQUAL(log_level_get_name(LogLevel::ERROR_LEVEL), "error");
 }
 
 BOOST_AUTO_TEST_CASE(log_category_name_tests)
@@ -648,12 +650,14 @@ BOOST_AUTO_TEST_CASE(log_category_name_tests)
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::BENCH), "bench");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::BLOCKSTORAGE), "blockstorage");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::COINDB), "coindb");
+    BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::ESTIMATEFEE), "estimatefee");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::KERNEL), "kernel");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::LEVELDB), "leveldb");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::MEMPOOL), "mempool");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::PRUNE), "prune");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::RAND), "rand");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::REINDEX), "reindex");
+    BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::TXPACKAGES), "txpackages");
     BOOST_CHECK_EQUAL(log_category_get_name(LogCategory::VALIDATION), "validation");
 }