From cacefa806358245298536aff49d464bf23c084f0 Mon Sep 17 00:00:00 2001
From: Bart <11445373+bthomee@users.noreply.github.com>
Date: Thu, 7 May 2026 12:59:44 -0400
Subject: [PATCH] Fixes

---
 src/test/app/GRPCServerTLS_test.cpp    | 2 +-
 src/test/rpc/AmendmentBlocked_test.cpp | 1 +
 src/test/rpc/Feature_test.cpp          | 1 +
 src/test/rpc/RPCOverload_test.cpp      | 1 +
 src/test/server/ServerStatus_test.cpp  | 4 ++--
 src/xrpld/app/main/NodeIdentity.cpp    | 2 ++
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/test/app/GRPCServerTLS_test.cpp b/src/test/app/GRPCServerTLS_test.cpp
index 650eccb3fe..afa1b26e99 100644
--- a/src/test/app/GRPCServerTLS_test.cpp
+++ b/src/test/app/GRPCServerTLS_test.cpp
@@ -811,7 +811,7 @@ public:
         (*cfg)[Sections::kPORT_GRPC].set(Keys::kSSL_CERT, getServerCertPath().string());
         (*cfg)[Sections::kPORT_GRPC].set(Keys::kSSL_KEY, getServerKeyPath().string());
         (*cfg)[Sections::kPORT_GRPC].set(
-            "ssl_cert_chain", getCACertPath().string());  // Using CA as intermediate
+            Keys::kSSL_CERT_CHAIN, getCACertPath().string());  // Using CA as intermediate
         (*cfg)[Sections::kPORT_GRPC].set(Keys::kSSL_CLIENT_CA, getCACertPath().string());
 
         Env env(*this, std::move(cfg));
diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp
index a30fdb1f58..ad92352ce3 100644
--- a/src/test/rpc/AmendmentBlocked_test.cpp
+++ b/src/test/rpc/AmendmentBlocked_test.cpp
@@ -20,6 +20,7 @@
 #include <xrpl/server/NetworkOPs.h>
 
 #include <memory>
+#include <string>
 
 namespace xrpl {
 
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index 332b99d69c..2c29062896 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -4,6 +4,7 @@
 
 #include <xrpld/core/Config.h>
 
+#include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp
index 3c718a93ae..4ee8d891b0 100644
--- a/src/test/rpc/RPCOverload_test.cpp
+++ b/src/test/rpc/RPCOverload_test.cpp
@@ -16,6 +16,7 @@
 #include <xrpl/protocol/jss.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace xrpl::test {
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index 4beddce735..dbb9ec1835 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -302,11 +302,11 @@ class ServerStatus_test : public beast::unit_test::Suite, public beast::test::En
         {
             auto const user = env.app()
                                   .config()[protoWs ? Sections::kPORT_WS : Sections::kPORT_RPC]
-                                  .get<std::string>("admin_user");
+                                  .get<std::string>(Keys::kADMIN_USER);
 
             auto const password = env.app()
                                       .config()[protoWs ? Sections::kPORT_WS : Sections::kPORT_RPC]
-                                      .get<std::string>("admin_password");
+                                      .get<std::string>(Keys::kADMIN_PASSWORD);
 
             // 1 - FAILS with wrong pass
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
diff --git a/src/xrpld/app/main/NodeIdentity.cpp b/src/xrpld/app/main/NodeIdentity.cpp
index c777753f32..b724351922 100644
--- a/src/xrpld/app/main/NodeIdentity.cpp
+++ b/src/xrpld/app/main/NodeIdentity.cpp
@@ -36,8 +36,10 @@ getNodeIdentity(Application& app, boost::program_options::variables_map const& c
         seed = parseBase58<Seed>(app.config().section(Sections::kNODE_SEED).lines().front());
 
         if (!seed)
+        {
             Throw<std::runtime_error>(
                 std::string("Invalid [") + Sections::kNODE_SEED + "] in configuration file");
+        }
     }
 
     if (seed)