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

Change "deferred proposal" to "stored". Complete move to NetworkOPs.

Browse Source
This commit is contained in:
JoelKatz
2012-10-16 05:28:41 -07:00
parent 94d607def0
commit c05e42ccb7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/NetworkOPs.cpp
View File

@@ -661,7 +661,6 @@ int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::pointer clo
prevLedger->setImmutable(); prevLedger->setImmutable();
mConsensus = boost::make_shared<LedgerConsensus>( mConsensus = boost::make_shared<LedgerConsensus>(
networkClosed, prevLedger, mLedgerMaster->getCurrentLedger()->getCloseTimeNC()); networkClosed, prevLedger, mLedgerMaster->getCurrentLedger()->getCloseTimeNC());
mConsensus->swapDefer(mDeferredProposals);
cLog(lsDEBUG) << "Initiating consensus engine"; cLog(lsDEBUG) << "Initiating consensus engine";
return mConsensus->startup(); return mConsensus->startup();
@@ -731,7 +730,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, cons
} }
if (prevLedger == mConsensus->getLCL()) if (prevLedger == mConsensus->getLCL())
return mConsensus->peerPosition(proposal); return mConsensus->peerPosition(proposal);
mConsensus->deferProposal(proposal, nodePublic); storeProposal(proposal, nodePublic);
return false; return false;
} }
@@ -741,7 +740,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, cons
{ // Note that if the LCL is different, the signature check will fail { // Note that if the LCL is different, the signature check will fail
cLog(lsWARNING) << "Ledger proposal fails signature check"; cLog(lsWARNING) << "Ledger proposal fails signature check";
proposal->setSignature(signature); proposal->setSignature(signature);
mConsensus->deferProposal(proposal, nodePublic); storeProposal(proposal, nodePublic);
return false; return false;
} }
return mConsensus->peerPosition(proposal); return mConsensus->peerPosition(proposal);
@@ -788,7 +787,6 @@ void NetworkOPs::endConsensus(bool correctLCL)
cLog(lsTRACE) << "Killing obsolete peer status"; cLog(lsTRACE) << "Killing obsolete peer status";
it->cycleStatus(); it->cycleStatus();
} }
mConsensus->swapDefer(mDeferredProposals);
mConsensus = boost::shared_ptr<LedgerConsensus>(); mConsensus = boost::shared_ptr<LedgerConsensus>();
} }
@@ -1247,6 +1245,14 @@ uint32 NetworkOPs::acceptLedger()
return mLedgerMaster->getCurrentLedger()->getLedgerSeq(); return mLedgerMaster->getCurrentLedger()->getLedgerSeq();
} }
void NetworkOPs::storeProposal(const LedgerProposal::pointer& proposal, const NewcoinAddress& peerPublic)
{
std::list<LedgerProposal::pointer>& props = mStoredProposals[peerPublic.getNodeID()];
if (props.size() >= (mLastCloseProposers + 10))
props.pop_front();
props.push_back(proposal);
}
#if 0 #if 0
void NetworkOPs::subAccountChanges(InfoSub* ispListener, const uint256 uLedgerHash) void NetworkOPs::subAccountChanges(InfoSub* ispListener, const uint256 uLedgerHash)
{ {