diff --git a/src/util/validation.cpp b/src/util/validation.cpp --- a/src/util/validation.cpp +++ b/src/util/validation.cpp @@ -8,12 +8,19 @@ #include #include -/** Convert ValidationState to a human-readable message for logging */ std::string FormatStateMessage(const ValidationState &state) { - return strprintf( - "%s%s (code %i)", state.GetRejectReason(), - state.GetDebugMessage().empty() ? "" : ", " + state.GetDebugMessage(), - state.GetRejectCode()); + if (state.IsValid()) { + return "Valid"; + } + + const std::string debug_message = state.GetDebugMessage(); + if (!debug_message.empty()) { + return strprintf("%s, %s (code %i)", state.GetRejectReason(), + debug_message, state.GetRejectCode()); + } + + return strprintf("%s (code %i)", state.GetRejectReason(), + state.GetRejectCode()); } const std::string strMessageMagic = "Bitcoin Signed Message:\n";