From 1a2ee706ebc762c12c8204f29f19c4e23296569b Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Wed, 28 Jan 2026 19:43:23 -0500 Subject: [PATCH] Fix formatting --- src/test/app/LedgerMaster_test.cpp | 46 +++------- src/test/app/SHAMapStore_test.cpp | 97 +++++++------------- src/xrpld/app/ledger/detail/LedgerMaster.cpp | 4 +- src/xrpld/app/misc/SHAMapStoreImp.cpp | 49 ++++------ 4 files changed, 64 insertions(+), 132 deletions(-) diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp index e833f1ad90..89a9bf0d5a 100644 --- a/src/test/app/LedgerMaster_test.cpp +++ b/src/test/app/LedgerMaster_test.cpp @@ -107,9 +107,7 @@ class LedgerMaster_test : public beast::unit_test::suite auto const deleteInterval = 8; - Env env{*this, envconfig([](auto cfg) { - return online_delete(std::move(cfg), deleteInterval); - })}; + Env env{*this, envconfig([](auto cfg) { return online_delete(std::move(cfg), deleteInterval); })}; auto const alice = Account("alice"); env.fund(XRP(1000), alice); @@ -122,18 +120,13 @@ class LedgerMaster_test : public beast::unit_test::suite store.rendezvous(); LedgerIndex lastRotated = store.getLastRotated(); BEAST_EXPECTS(maxSeq == 3, to_string(maxSeq)); - BEAST_EXPECTS( - lm.getCompleteLedgers() == "2-3", lm.getCompleteLedgers()); + BEAST_EXPECTS(lm.getCompleteLedgers() == "2-3", lm.getCompleteLedgers()); BEAST_EXPECTS(lastRotated == 3, to_string(lastRotated)); BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); // Close enough ledgers to rotate a few times for (int i = 0; i < 24; ++i) @@ -152,27 +145,16 @@ class LedgerMaster_test : public beast::unit_test::suite minSeq = lastRotated; lastRotated = maxSeq; } - BEAST_EXPECTS( - env.closed()->header().seq == maxSeq, - to_string(env.closed()->header().seq)); - BEAST_EXPECTS( - store.getLastRotated() == lastRotated, - to_string(store.getLastRotated())); + BEAST_EXPECTS(env.closed()->header().seq == maxSeq, to_string(env.closed()->header().seq)); + BEAST_EXPECTS(store.getLastRotated() == lastRotated, to_string(store.getLastRotated())); std::stringstream expectedRange; expectedRange << minSeq << "-" << maxSeq; - BEAST_EXPECTS( - lm.getCompleteLedgers() == expectedRange.str(), - lm.getCompleteLedgers()); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); + BEAST_EXPECTS(lm.getCompleteLedgers() == expectedRange.str(), lm.getCompleteLedgers()); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); } } diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp index eafb927a1d..eafb1aac12 100644 --- a/src/test/app/SHAMapStore_test.cpp +++ b/src/test/app/SHAMapStore_test.cpp @@ -583,9 +583,7 @@ public: std::map hashes; - auto failureMessage = [&](char const* label, - auto expected, - auto actual) { + auto failureMessage = [&](char const* label, auto expected, auto actual) { std::stringstream ss; ss << label << ": Expected: " << expected << ", Got: " << actual; return ss.str(); @@ -602,18 +600,13 @@ public: store.rendezvous(); LedgerIndex lastRotated = store.getLastRotated(); BEAST_EXPECTS(maxSeq == 3, to_string(maxSeq)); - BEAST_EXPECTS( - lm.getCompleteLedgers() == "2-3", lm.getCompleteLedgers()); + BEAST_EXPECTS(lm.getCompleteLedgers() == "2-3", lm.getCompleteLedgers()); BEAST_EXPECTS(lastRotated == 3, to_string(lastRotated)); BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); // Close enough ledgers to rotate a few times while (maxSeq < 20) @@ -641,26 +634,20 @@ public: } lm.clearLedger(deleteSeq); - auto expectedRange = - [](auto minSeq, auto deleteSeq, auto maxSeq) { - std::stringstream expectedRange; - expectedRange << minSeq << "-" << (deleteSeq - 1); - if (deleteSeq + 1 == maxSeq) - expectedRange << "," << maxSeq; - else if (deleteSeq < maxSeq) - expectedRange << "," << (deleteSeq + 1) << "-" - << maxSeq; - return expectedRange.str(); - }; + auto expectedRange = [](auto minSeq, auto deleteSeq, auto maxSeq) { + std::stringstream expectedRange; + expectedRange << minSeq << "-" << (deleteSeq - 1); + if (deleteSeq + 1 == maxSeq) + expectedRange << "," << maxSeq; + else if (deleteSeq < maxSeq) + expectedRange << "," << (deleteSeq + 1) << "-" << maxSeq; + return expectedRange.str(); + }; BEAST_EXPECTS( - lm.getCompleteLedgers() == - expectedRange(minSeq, deleteSeq, maxSeq), + lm.getCompleteLedgers() == expectedRange(minSeq, deleteSeq, maxSeq), failureMessage( - "Complete ledgers", - expectedRange(minSeq, deleteSeq, maxSeq), - lm.getCompleteLedgers())); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 1); + "Complete ledgers", expectedRange(minSeq, deleteSeq, maxSeq), lm.getCompleteLedgers())); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 1); // Close another ledger, which will trigger a rotation, but the // rotation will be stuck until the missing ledger is filled in. @@ -671,15 +658,11 @@ public: // Nothing has changed BEAST_EXPECTS( store.getLastRotated() == lastRotated, - failureMessage( - "lastRotated", lastRotated, store.getLastRotated())); + failureMessage("lastRotated", lastRotated, store.getLastRotated())); BEAST_EXPECTS( - lm.getCompleteLedgers() == - expectedRange(minSeq, deleteSeq, maxSeq), + lm.getCompleteLedgers() == expectedRange(minSeq, deleteSeq, maxSeq), failureMessage( - "Complete ledgers", - expectedRange(minSeq, deleteSeq, maxSeq), - lm.getCompleteLedgers())); + "Complete ledgers", expectedRange(minSeq, deleteSeq, maxSeq), lm.getCompleteLedgers())); // Close 5 more ledgers, waiting one second in between to // simulate the ledger making progress while online delete waits @@ -694,17 +677,11 @@ public: // Nothing has changed BEAST_EXPECTS( store.getLastRotated() == lastRotated, - failureMessage( - "lastRotated", - lastRotated, - store.getLastRotated())); + failureMessage("lastRotated", lastRotated, store.getLastRotated())); BEAST_EXPECTS( - lm.getCompleteLedgers() == - expectedRange(minSeq, deleteSeq, maxSeq), + lm.getCompleteLedgers() == expectedRange(minSeq, deleteSeq, maxSeq), failureMessage( - "Complete Ledgers", - expectedRange(minSeq, deleteSeq, maxSeq), - lm.getCompleteLedgers())); + "Complete Ledgers", expectedRange(minSeq, deleteSeq, maxSeq), lm.getCompleteLedgers())); std::this_thread::sleep_for(1s); } @@ -719,30 +696,20 @@ public: } BEAST_EXPECT(maxSeq != lastRotated + deleteInterval); BEAST_EXPECTS( - env.closed()->header().seq == maxSeq, - failureMessage("maxSeq", maxSeq, env.closed()->header().seq)); + env.closed()->header().seq == maxSeq, failureMessage("maxSeq", maxSeq, env.closed()->header().seq)); BEAST_EXPECTS( store.getLastRotated() == lastRotated, - failureMessage( - "lastRotated", lastRotated, store.getLastRotated())); + failureMessage("lastRotated", lastRotated, store.getLastRotated())); std::stringstream expectedRange; expectedRange << minSeq << "-" << maxSeq; BEAST_EXPECTS( lm.getCompleteLedgers() == expectedRange.str(), - failureMessage( - "CompleteLedgers", - expectedRange.str(), - lm.getCompleteLedgers())); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); - BEAST_EXPECT( - lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); + failureMessage("CompleteLedgers", expectedRange.str(), lm.getCompleteLedgers())); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq, maxSeq) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 1, maxSeq - 1) == 0); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 1, maxSeq + 1) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq - 2, maxSeq - 2) == 2); + BEAST_EXPECT(lm.missingFromCompleteLedgerRange(minSeq + 2, maxSeq + 2) == 2); } } diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp index 0ab8df71c9..b12e6574ca 100644 --- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp +++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp @@ -1482,9 +1482,7 @@ LedgerMaster::getCompleteLedgers() const } std::size_t -LedgerMaster::missingFromCompleteLedgerRange( - LedgerIndex first, - LedgerIndex last) const +LedgerMaster::missingFromCompleteLedgerRange(LedgerIndex first, LedgerIndex last) const { // Make a copy of the range to avoid holding the lock auto const range = [&] { diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp index f78d8a91f8..77c7b38609 100644 --- a/src/xrpld/app/misc/SHAMapStoreImp.cpp +++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp @@ -264,8 +264,7 @@ SHAMapStoreImp::run() bool const readyToRotate = validatedSeq >= lastRotated + deleteInterval_ && canDelete_ >= lastRotated - 1 && healthWait() == keepGoing; - JLOG(journal_.debug()) - << "run: Setting lastGoodValidatedLedger_ to " << validatedSeq; + JLOG(journal_.debug()) << "run: Setting lastGoodValidatedLedger_ to " << validatedSeq; { // Note that this is set after the healthWait() check, so that we @@ -279,14 +278,11 @@ SHAMapStoreImp::run() // will delete up to (not including) lastRotated if (readyToRotate) { - JLOG(journal_.warn()) - << "rotating validatedSeq " << validatedSeq << " lastRotated " - << lastRotated << " deleteInterval " << deleteInterval_ - << " canDelete_ " << canDelete_ << " state " - << app_.getOPs().strOperatingMode(false) << " age " - << ledgerMaster_->getValidatedLedgerAge().count() - << "s. Complete ledgers: " - << ledgerMaster_->getCompleteLedgers(); + JLOG(journal_.warn()) << "rotating validatedSeq " << validatedSeq << " lastRotated " << lastRotated + << " deleteInterval " << deleteInterval_ << " canDelete_ " << canDelete_ << " state " + << app_.getOPs().strOperatingMode(false) << " age " + << ledgerMaster_->getValidatedLedgerAge().count() + << "s. Complete ledgers: " << ledgerMaster_->getCompleteLedgers(); clearPrior(lastRotated); if (healthWait() == stopping) @@ -339,10 +335,9 @@ SHAMapStoreImp::run() clearCaches(validatedSeq); }); - JLOG(journal_.warn()) - << "finished rotation. validatedSeq: " << validatedSeq - << ", lastRotated: " << lastRotated << ". Complete ledgers: " - << ledgerMaster_->getCompleteLedgers(); + JLOG(journal_.warn()) << "finished rotation. validatedSeq: " << validatedSeq + << ", lastRotated: " << lastRotated + << ". Complete ledgers: " << ledgerMaster_->getCompleteLedgers(); } } } @@ -574,11 +569,8 @@ SHAMapStoreImp::healthWait() OperatingMode mode = netOPs_->getOperatingMode(); std::unique_lock lock(mutex_); - auto numMissing = ledgerMaster_->missingFromCompleteLedgerRange( - lastGoodValidatedLedger_, index); - while ( - !stop_ && - (mode != OperatingMode::FULL || age > ageThreshold_ || numMissing > 0)) + auto numMissing = ledgerMaster_->missingFromCompleteLedgerRange(lastGoodValidatedLedger_, index); + while (!stop_ && (mode != OperatingMode::FULL || age > ageThreshold_ || numMissing > 0)) { // this value shouldn't change, so grab it while we have the // lock @@ -586,28 +578,21 @@ SHAMapStoreImp::healthWait() lock.unlock(); - auto const stream = mode != OperatingMode::FULL || age > ageThreshold_ - ? journal_.warn() - : journal_.info(); + auto const stream = mode != OperatingMode::FULL || age > ageThreshold_ ? journal_.warn() : journal_.info(); JLOG(stream) << "Waiting " << recoveryWaitTime_.count() - << "s for node to stabilize. state: " - << app_.getOPs().strOperatingMode(mode, false) << ". age " - << age.count() << "s. Missing ledgers: " << numMissing - << ". Expect: " << lastGood << "-" << index - << ". Complete ledgers: " - << ledgerMaster_->getCompleteLedgers(); + << "s for node to stabilize. state: " << app_.getOPs().strOperatingMode(mode, false) << ". age " + << age.count() << "s. Missing ledgers: " << numMissing << ". Expect: " << lastGood << "-" << index + << ". Complete ledgers: " << ledgerMaster_->getCompleteLedgers(); std::this_thread::sleep_for(recoveryWaitTime_); index = ledgerMaster_->getValidLedgerIndex(); age = ledgerMaster_->getValidatedLedgerAge(); mode = netOPs_->getOperatingMode(); - numMissing = - ledgerMaster_->missingFromCompleteLedgerRange(lastGood, index); + numMissing = ledgerMaster_->missingFromCompleteLedgerRange(lastGood, index); lock.lock(); } - JLOG(journal_.debug()) << "healthWait: Setting lastGoodValidatedLedger_ to " - << index; + JLOG(journal_.debug()) << "healthWait: Setting lastGoodValidatedLedger_ to " << index; lastGoodValidatedLedger_ = index; return stop_ ? stopping : keepGoing;