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

Close time fixes.

Browse Source
This commit is contained in:
JoelKatz
2012-07-15 23:46:38 -07:00
parent 16451d8d55
commit 2e2547ad0a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Ledger.cpp
View File

@@ -154,6 +154,7 @@ void Ledger::setAccepted(uint32 closeTime, int closeResolution, bool correctClos
void Ledger::setAccepted()
{ // used when we acquired the ledger
assert(mClosed && (mCloseResolution != 0) && (mCloseResolution != 0));
mCloseTime -= mCloseTime % mCloseResolution;
updateHash();
mAccepted = true;
mImmutable = true;

6
src/LedgerConsensus.cpp
View File

@@ -492,8 +492,8 @@ void LedgerConsensus::updateOurPositions()
std::map<uint32, int> closeTimes;
for (boost::unordered_map<uint160, LedgerProposal::pointer>::iterator it = mPeerPositions.begin(),
end = mPeerPositions.end(); it != end; ++it)
++closeTimes[it->second->getCloseTime() % mCloseResolution];
++closeTimes[mOurPosition->getCloseTime() % mCloseResolution];
++closeTimes[it->second->getCloseTime() - (it->second->getCloseTime % mCloseResolution)];
++closeTimes[mOurPosition->getCloseTime() - (mOurPosition->getCloseTime() % mCloseResolution)];
int neededWeight;
@@ -513,7 +513,7 @@ void LedgerConsensus::updateOurPositions()
closeTime = it->first;
}
}
if (closeTime != (mOurPosition->getCloseTime() % mCloseResolution))
if (closeTime != (mOurPosition->getCloseTime() - (mOurPosition->getCloseTime() % mCloseResolution)))
changes = true;
if (changes)