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

Differentiate the two beginConsensus cases. (Ledger close or network

Browse Source 
showing consensus traffic.)
This commit is contained in:
JoelKatz
2012-05-26 14:20:46 -07:00
parent 9fb8674710
commit 5c4d3743a4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NetworkOPs.cpp
View File

@@ -319,7 +319,7 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
Ledger::pointer currentLedger = theApp->getMasterLedger().getCurrentLedger();
if (getNetworkTimeNC() >= currentLedger->getCloseTimeNC())
{
setStateTimer(beginConsensus(currentLedger));
setStateTimer(beginConsensus(currentLedger, false));
return;
}
@@ -351,7 +351,7 @@ void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger)
}
// vim:ts=4
int NetworkOPs::beginConsensus(Ledger::pointer closingLedger)
int NetworkOPs::beginConsensus(Ledger::pointer closingLedger, bool isEarly)
{
#ifdef DEBUG
std::cerr << "Ledger close time for ledger " << closingLedger->getLedgerSeq() << std::endl;
@@ -409,8 +409,8 @@ bool NetworkOPs::proposeLedger(uint32 closingSeq, uint32 proposeSeq, const uint2
if (!mConsensus)
{
if ((getNetworkTimeNC() + 2) >= currentLedger->getCloseTimeNC())
setStateTimer(beginConsensus(currentLedger));
if (!mConsensus) return true;
setStateTimer(beginConsensus(currentLedger, true));
if (!mConsensus) return false;
}
return mConsensus->peerPosition(proposal);