ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2013-02-10 01:09:37 -08:00
parent e5220a721c
commit b39a977282
3 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpp/ripple/Ledger.cpp
View File

@@ -88,10 +88,7 @@ Ledger::Ledger(bool /* dummy */, Ledger& prevLedger) :
mCloseResolution = ContinuousLedgerTiming::getNextLedgerTimeResolution(prevLedger.mCloseResolution,
prevLedger.getCloseAgree(), mLedgerSeq);
if (prevLedger.mCloseTime == 0)
{
mCloseTime = theApp->getOPs().getCloseTimeNC() - mCloseResolution;
mCloseTime -= (mCloseTime % mCloseResolution);
}
mCloseTime = roundCloseTime(theApp->getOPs().getCloseTimeNC(), mCloseResolution);
else
mCloseTime = prevLedger.mCloseTime + mCloseResolution;
zeroFees();
@@ -181,7 +178,7 @@ void Ledger::addRaw(Serializer &s) const
void Ledger::setAccepted(uint32 closeTime, int closeResolution, bool correctCloseTime)
{ // used when we witnessed the consensus
assert(mClosed && !mAccepted);
mCloseTime = correctCloseTime ? (closeTime - (closeTime % closeResolution)) : closeTime;
mCloseTime = correctCloseTime ? roundCloseTime(closeTime, closeResolution) : closeTime;
mCloseResolution = closeResolution;
mCloseFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime;
mAccepted = true;
@@ -192,7 +189,7 @@ void Ledger::setAccepted()
{ // used when we acquired the ledger
// FIXME assert(mClosed && (mCloseTime != 0) && (mCloseResolution != 0));
if ((mCloseFlags & sLCF_NoConsensusTime) == 0)
mCloseTime -= mCloseTime % mCloseResolution;
mCloseTime = roundCloseTime(mCloseTime, mCloseResolution);
mAccepted = true;
setImmutable();
}
@@ -1422,6 +1419,13 @@ int Ledger::getPendingSaves()
return sPendingSaves;
}
uint32 Ledger::roundCloseTime(uint32 closeTime, uint32 closeResolution)
{
if (closeTime == 0)
return 0;
return closeTime - (closeTime % closeResolution);
}
void Ledger::pendSave(bool fromConsensus)
{
if (!fromConsensus && !theApp->isNewFlag(getHash(), SF_SAVED))