ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Replace assert with XRPL_ASSERT (#5312)

Browse Source
This commit is contained in:
Bronek Kozicki
2025-02-25 16:43:26 +00:00
committed by GitHub
parent 9745718467
commit 37d06bcce8
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xrpld/app/misc/detail/AmendmentTable.cpp
View File

@@ -226,7 +226,10 @@ public:
toBase58(TokenType::NodePublic, votes.first); toBase58(TokenType::NodePublic, votes.first);
if (!votes.second.timeout) if (!votes.second.timeout)
{ {
assert(votes.second.upVotes.empty()); XRPL_ASSERT(
votes.second.upVotes.empty(),
"ripple::TrustedVotes::recordVotes : received no "
"upvotes");
JLOG(j.debug()) JLOG(j.debug())
<< "recordVotes: Have not received any " << "recordVotes: Have not received any "
"amendment votes from " "amendment votes from "
@@ -242,7 +245,10 @@ public:
} }
else if (votes.second.timeout != newTimeout) 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; using namespace std::chrono;
auto const age = duration_cast<minutes>( auto const age = duration_cast<minutes>(
newTimeout - *votes.second.timeout); newTimeout - *votes.second.timeout);
@@ -262,9 +268,10 @@ public:
int available = 0; int available = 0;
for (auto& validatorVotes : recordedVotes_) for (auto& validatorVotes : recordedVotes_)
{ {
assert( XRPL_ASSERT(
validatorVotes.second.timeout || validatorVotes.second.timeout ||
validatorVotes.second.upVotes.empty()); validatorVotes.second.upVotes.empty(),
"ripple::TrustedVotes::getVotes : valid votes");
if (validatorVotes.second.timeout) if (validatorVotes.second.timeout)
++available; ++available;
for (uint256 const& amendment : validatorVotes.second.upVotes) for (uint256 const& amendment : validatorVotes.second.upVotes)

2
src/xrpld/overlay/detail/PeerImp.cpp
View File

@@ -1245,7 +1245,7 @@ PeerImp::handleTransaction(
{ {
XRPL_ASSERT( XRPL_ASSERT(
eraseTxQueue != batch, eraseTxQueue != batch,
("ripple::PeerImp::handleTransaction correct function params")); ("ripple::PeerImp::handleTransaction : valid inputs"));
if (tracking_.load() == Tracking::diverged) if (tracking_.load() == Tracking::diverged)
return; return;

3
src/xrpld/overlay/detail/PeerImp.h
View File

@@ -154,7 +154,8 @@ private:
update(Resource::Charge f, std::string const& add) update(Resource::Charge f, std::string const& add)
{ {
XRPL_ASSERT( XRPL_ASSERT(
f >= fee, "ripple::PeerImp::ChargeWithContext fee increases"); f >= fee,
"ripple::PeerImp::ChargeWithContext::update : fee increases");
fee = f; fee = f;
if (!context.empty()) if (!context.empty())
{ {