Refactor FormatStateMessage for clarity

All cases of CValidationState were condensed into one strprintf call.
This is no longer suitable as more cases are added (e.g., IsValid).

1 files changed, 6 insertions, 4 deletions

diff --git a/src/util/validation.cpp b/src/util/validation.cpp
index 603db51d4..ed9c108bb 100644
--- a/src/util/validation.cpp
+++ b/src/util/validation.cpp
@@ -8,16 +8,18 @@
 #include <consensus/validation.h>
 #include <tinyformat.h>
 
-/** Convert ValidationState to a human-readable message for logging */
 std::string FormatStateMessage(const ValidationState &state)
 {
     if (state.IsValid()) {
         return "Valid";
     }
 
-    return strprintf("%s%s",
-        state.GetRejectReason(),
-        state.GetDebugMessage().empty() ? "" : ", "+state.GetDebugMessage());
+    const std::string debug_message = state.GetDebugMessage();
+    if (!debug_message.empty()) {
+        return strprintf("%s, %s", state.GetRejectReason(), debug_message);
+    }
+
+    return state.GetRejectReason();
 }
 
 const std::string strMessageMagic = "Bitcoin Signed Message:\n";