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

Cleanups

Browse Source
This commit is contained in:
JoelKatz
2015-10-29 10:56:07 -07:00
committed by Nik Bougalis
parent 98bdb9de68
commit 0458d1910e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ripple/app/ledger/Ledger.cpp
View File

@@ -405,8 +405,7 @@ void Ledger::setAccepted (
std::uint32_t closeTime, int closeResolution, bool correctCloseTime, std::uint32_t closeTime, int closeResolution, bool correctCloseTime,
Config const& config) Config const& config)
{ {
// Used when we witnessed the consensus. Rounds the close time, updates the // Used when we witnessed the consensus.
// hash, and sets the ledger accepted and immutable.
assert (closed()); assert (closed());
info_.closeTime = closeTime; info_.closeTime = closeTime;

10
src/ripple/app/ledger/impl/LedgerConsensusImp.cpp
View File

@@ -442,7 +442,7 @@ void LedgerConsensusImp::mapCompleteInternal (
auto it = mAcquired.find (hash); auto it = mAcquired.find (hash);
// If we have already acquired this transaction set // If we have already acquired this transaction set
if (mAcquired.find (hash) != mAcquired.end ()) if (it != mAcquired.end ())
{ {
if (it->second) if (it->second)
{ {
@@ -595,14 +595,12 @@ void LedgerConsensusImp::checkLCL ()
JLOG (j_.warning) JLOG (j_.warning)
<< ripple::getJson (*mPreviousLedger); << ripple::getJson (*mPreviousLedger);
if (ShouldLog (lsDEBUG, LedgerConsensus)) if (j_.debug)
{ {
for (auto& it : vals) for (auto& it : vals)
{ j_.debug
JLOG (j_.debug)
<< "V: " << it.first << ", " << it.second.first; << "V: " << it.first << ", " << it.second.first;
} }
}
if (mHaveCorrectLCL) if (mHaveCorrectLCL)
app_.getOPs ().consensusViewChange (); app_.getOPs ().consensusViewChange ();
@@ -1641,7 +1639,7 @@ void LedgerConsensusImp::updateOurPositions ()
for (auto it = closeTimes.begin () for (auto it = closeTimes.begin ()
, end = closeTimes.end (); it != end; ++it) , end = closeTimes.end (); it != end; ++it)
{ {
JLOG (j_.debug) << "CCTime: seq" JLOG (j_.debug) << "CCTime: seq "
<< mPreviousLedger->info().seq + 1 << ": " << mPreviousLedger->info().seq + 1 << ": "
<< it->first << " has " << it->second << ", " << it->first << " has " << it->second << ", "
<< threshVote << " required"; << threshVote << " required";