From 37d06bcce826fb174cb17eb544fb486817e3fd72 Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Tue, 25 Feb 2025 16:43:26 +0000
Subject: [PATCH] Fix Replace `assert` with `XRPL_ASSERT` (#5312)

---
 src/xrpld/app/misc/detail/AmendmentTable.cpp | 15 +++++++++++----
 src/xrpld/overlay/detail/PeerImp.cpp         |  2 +-
 src/xrpld/overlay/detail/PeerImp.h           |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index d496fc4e5e..d7a5ae8247 100644
--- a/src/xrpld/app/misc/detail/AmendmentTable.cpp
+++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp
@@ -226,7 +226,10 @@ public:
                     toBase58(TokenType::NodePublic, votes.first);
                 if (!votes.second.timeout)
                 {
-                    assert(votes.second.upVotes.empty());
+                    XRPL_ASSERT(
+                        votes.second.upVotes.empty(),
+                        "ripple::TrustedVotes::recordVotes : received no "
+                        "upvotes");
                     JLOG(j.debug())
                         << "recordVotes: Have not received any "
                            "amendment votes from "
@@ -242,7 +245,10 @@ public:
                 }
                 else if (votes.second.timeout != newTimeout)
                 {
-                    assert(votes.second.timeout < newTimeout);
+                    XRPL_ASSERT(
+                        votes.second.timeout < newTimeout,
+                        "ripple::TrustedVotes::recordVotes : votes not "
+                        "expired");
                     using namespace std::chrono;
                     auto const age = duration_cast<minutes>(
                         newTimeout - *votes.second.timeout);
@@ -262,9 +268,10 @@ public:
         int available = 0;
         for (auto& validatorVotes : recordedVotes_)
         {
-            assert(
+            XRPL_ASSERT(
                 validatorVotes.second.timeout ||
-                validatorVotes.second.upVotes.empty());
+                    validatorVotes.second.upVotes.empty(),
+                "ripple::TrustedVotes::getVotes : valid votes");
             if (validatorVotes.second.timeout)
                 ++available;
             for (uint256 const& amendment : validatorVotes.second.upVotes)
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index c3656c9445..8989f89fb3 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -1245,7 +1245,7 @@ PeerImp::handleTransaction(
 {
     XRPL_ASSERT(
         eraseTxQueue != batch,
-        ("ripple::PeerImp::handleTransaction correct function params"));
+        ("ripple::PeerImp::handleTransaction : valid inputs"));
     if (tracking_.load() == Tracking::diverged)
         return;
 
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index 14591efbb1..23916db217 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -154,7 +154,8 @@ private:
         update(Resource::Charge f, std::string const& add)
         {
             XRPL_ASSERT(
-                f >= fee, "ripple::PeerImp::ChargeWithContext fee increases");
+                f >= fee,
+                "ripple::PeerImp::ChargeWithContext::update : fee increases");
             fee = f;
             if (!context.empty())
             {