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

Cleanup.

Browse Source 
Fix a bug when we incompletely remove a vote on a disputed transaction.
This commit is contained in:
JoelKatz
2012-09-03 08:35:53 -07:00
parent b4548760df
commit df1e5ab95a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/LedgerConsensus.cpp
View File

@@ -170,6 +170,7 @@ void LCTransaction::unVote(const uint160& peer)
--mYays;
else
--mNays;
mVotes.erase(it);
}
}
@@ -208,8 +209,8 @@ bool LCTransaction::updatePosition(int percentTime, bool proposing)
}
LedgerConsensus::LedgerConsensus(const uint256& prevLCLHash, Ledger::ref previousLedger, uint32 closeTime)
: mState(lcsPRE_CLOSE), mCloseTime(closeTime), mPrevLedgerHash(prevLCLHash), mPreviousLedger(previousLedger),
mCurrentMSeconds(0), mClosePercent(0), mHaveCloseTimeConsensus(false)
: mState(lcsPRE_CLOSE), mCloseTime(closeTime), mPrevLedgerHash(prevLCLHash),
mPreviousLedger(previousLedger), mCurrentMSeconds(0), mClosePercent(0), mHaveCloseTimeConsensus(false)
{
mValSeed = theConfig.VALIDATION_SEED;
mConsensusStartTime = boost::posix_time::microsec_clock::universal_time();
@@ -343,7 +344,7 @@ void LedgerConsensus::takeInitialPosition(Ledger& initialLedger)
mOurPosition = boost::make_shared<LedgerProposal>(initialLedger.getParentHash(), txSet, mCloseTime);
mapComplete(txSet, initialSet, false);
if (mProposing)
propose(std::vector<uint256>(), std::vector<uint256>());
propose();
}
void LedgerConsensus::createDisputes(const SHAMap::pointer& m1, const SHAMap::pointer& m2)
@@ -543,7 +544,7 @@ void LedgerConsensus::updateOurPositions()
bool changes = false;
SHAMap::pointer ourPosition;
std::vector<uint256> addedTx, removedTx;
// std::vector<uint256> addedTx, removedTx;
// Verify freshness of peer positions and compute close times
std::map<uint32, int> closeTimes;
@@ -578,12 +579,12 @@ void LedgerConsensus::updateOurPositions()
if (it.second->getOurPosition()) // now a yes
{
ourPosition->addItem(SHAMapItem(it.first, it.second->peekTransaction()), true, false);
addedTx.push_back(it.first);
// addedTx.push_back(it.first);
}
else // now a no
{
ourPosition->delItem(it.first);
removedTx.push_back(it.first);
// removedTx.push_back(it.first);
}
}
}
@@ -642,7 +643,7 @@ void LedgerConsensus::updateOurPositions()
uint256 newHash = ourPosition->getHash();
mOurPosition->changePosition(newHash, closeTime);
if (mProposing)
propose(addedTx, removedTx);
propose();
mapComplete(newHash, ourPosition, false);
Log(lsINFO) << "Position change: CTime " << closeTime << ", tx " << newHash;
}
@@ -726,7 +727,7 @@ void LedgerConsensus::startAcquiring(const TransactionAcquire::pointer& acquire)
acquire->resetTimer();
}
void LedgerConsensus::propose(const std::vector<uint256>& added, const std::vector<uint256>& removed)
void LedgerConsensus::propose()
{
Log(lsTRACE) << "We propose: " << mOurPosition->getCurrentHash();
newcoin::TMProposeSet prop;

2
src/LedgerConsensus.h
View File

@@ -126,7 +126,7 @@ protected:
void createDisputes(const SHAMap::pointer&, const SHAMap::pointer&);
void addDisputedTransaction(const uint256&, const std::vector<unsigned char>& transaction);
void adjustCount(const SHAMap::pointer& map, const std::vector<uint160>& peers);
void propose(const std::vector<uint256>& addedTx, const std::vector<uint256>& removedTx);
void propose();
void addPosition(LedgerProposal&, bool ours);
void removePosition(LedgerProposal&, bool ours);