Fix small issues

XRPLF · Dec 26, 2024 · ed29df5 · ed29df5
1 parent 04a6da8
commit ed29df5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/migration/impl/MigrationManagerFactory.cpp b/src/migration/impl/MigrationManagerFactory.cpp
@@ -37,13 +37,13 @@ namespace migration::impl {
 std::expected<std::shared_ptr<MigrationManagerInterface>, std::string>
 makeMigrationManager(util::config::ClioConfigDefinition const& config)
 {
-    static util::Logger const kLOG{"Migration"};
-    LOG(kLOG.info()) << "Constructing MigrationManager";
+    static util::Logger const log{"Migration"};  // NOLINT(readability-identifier-naming)
+    LOG(log.info()) << "Constructing MigrationManager";
 
     auto const type = config.get<std::string>("database.type");
 
     if (not boost::iequals(type, "cassandra")) {
-        LOG(kLOG.error()) << "Unknown database type to migrate: " << type;
+        LOG(log.error()) << "Unknown database type to migrate: " << type;
         return std::unexpected(std::string("Invalid database type"));
     }
 

diff --git a/src/rpc/Errors.cpp b/src/rpc/Errors.cpp
@@ -55,7 +55,7 @@ getWarningInfo(WarningCode code)
     };
 
     auto matchByCode = [code](auto const& info) { return info.code == code; };
-    if (auto it = std::ranges::find_if(kINFOS, matchByCode); it != end(kINFOS))
+    if (auto it = ranges::find_if(kINFOS, matchByCode); it != end(kINFOS))
         return *it;
 
     throw(out_of_range("Invalid WarningCode"));
@@ -110,7 +110,7 @@ getErrorInfo(ClioError code)
     };
 
     auto matchByCode = [code](auto const& info) { return info.code == code; };
-    if (auto it = ranges::find_if(begin(kINFOS), end(kINFOS), matchByCode); it != end(kINFOS))
+    if (auto it = ranges::find_if(kINFOS, matchByCode); it != end(kINFOS))
         return *it;
 
     throw(out_of_range("Invalid error code"));

diff --git a/src/util/prometheus/MetricBase.cpp b/src/util/prometheus/MetricBase.cpp
@@ -55,7 +55,7 @@ toString(MetricType type)
             [[fallthrough]];
         case MetricType::HistogramDouble:
             return "histogram";
-        case MetricType::SUMMARY:
+        case MetricType::Summary:
             return "summary";
         default:
             ASSERT(false, "Unknown metric {}.", static_cast<int>(type));

diff --git a/src/util/prometheus/MetricBase.hpp b/src/util/prometheus/MetricBase.hpp
@@ -83,7 +83,7 @@ class MetricBase {
     std::string labelsString_;
 };
 
-enum class MetricType { CounterInt, CounterDouble, GaugeInt, GaugeDouble, HistogramInt, HistogramDouble, SUMMARY };
+enum class MetricType { CounterInt, CounterDouble, GaugeInt, GaugeDouble, HistogramInt, HistogramDouble, Summary };
 
 char const*
 toString(MetricType type);

diff --git a/src/util/prometheus/MetricBuilder.cpp b/src/util/prometheus/MetricBuilder.cpp
@@ -78,7 +78,7 @@ MetricBuilder::makeMetric(std::string name, std::string labelsString, MetricType
             [[fallthrough]];
         case MetricType::HistogramDouble:
             [[fallthrough]];
-        case MetricType::SUMMARY:
+        case MetricType::Summary:
             [[fallthrough]];
         default:
             ASSERT(false, "Unknown metric type: {}", static_cast<int>(type));
@@ -120,7 +120,7 @@ MetricBuilder::makeHistogram(
             [[fallthrough]];
         case MetricType::GaugeDouble:
             [[fallthrough]];
-        case MetricType::SUMMARY:
+        case MetricType::Summary:
             [[fallthrough]];
         default:
             ASSERT(false, "Unknown metric type: {}", static_cast<int>(type));

diff --git a/tests/unit/util/prometheus/MetricBuilderTests.cpp b/tests/unit/util/prometheus/MetricBuilderTests.cpp
@@ -80,5 +80,5 @@ TEST(MetricBuilderDeathTest, build)
             EXPECT_EQ(metric->labelsString(), labelsString);
         }
     }
-    EXPECT_DEATH({ builder(name, labelsString, MetricType::SUMMARY, std::vector<std::int64_t>{}); }, "");
+    EXPECT_DEATH({ builder(name, labelsString, MetricType::Summary, std::vector<std::int64_t>{}); }, "");
 }