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

Extra debug

Browse Source
This commit is contained in:
JoelKatz
2012-06-01 20:34:05 -07:00
parent be931912c6
commit 46e69d324c
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/LedgerMaster.cpp
View File

@@ -1,8 +1,12 @@
#include "LedgerMaster.h"
#include <boost/foreach.hpp>
#include "Application.h"
#include "NewcoinAddress.h"
#include "Conversion.h"
#include <boost/foreach.hpp>
#include "Log.h"
uint32 LedgerMaster::getCurrentLedgerIndex()
{
@@ -19,12 +23,12 @@ void LedgerMaster::pushLedger(Ledger::pointer newLedger)
{
// Caller should already have properly assembled this ledger into "ready-to-close" form --
// all candidate transactions must already be appled
Log(lsINFO) << "PushLedger: " << newLedger->getHash().GetHex();
ScopedLock sl(mLock);
if (!!mFinalizedLedger)
{
mFinalizedLedger->setClosed();
mFinalizedLedger->setAccepted();
mLedgerHistory.addAcceptedLedger(mFinalizedLedger);
Log(lsTRACE) << "Finalizes: " << mFinalizedLedger->getHash().GetHex();
}
mFinalizedLedger = mCurrentLedger;
mCurrentLedger = newLedger;
@@ -35,10 +39,14 @@ void LedgerMaster::pushLedger(Ledger::pointer newLCL, Ledger::pointer newOL)
{
assert(newLCL->isClosed() && newLCL->isAccepted());
assert(!newOL->isClosed() && !newOL->isAccepted());
Log(lsINFO) << "PushAccept: " << newLCL->getHash().GetHex();
ScopedLock sl(mLock);
if (!!mFinalizedLedger)
if (mFinalizedLedger && mFinalizedLedger->isAccepted())
{
mLedgerHistory.addAcceptedLedger(mFinalizedLedger);
Log(lsINFO) << "StashAccepted: " << mFinalizedLedger->getHash().GetHex();
}
mFinalizedLedger = newLCL;
mCurrentLedger = newOL;
mEngine.setLedger(newOL);
@@ -99,18 +107,6 @@ void LedgerMaster::applyFutureProposals(uint32 ledgerIndex)
}
}
void LedgerMaster::applyFutureTransactions(uint32 ledgerIndex)
{
for(list<TransactionPtr>::iterator iter=mFutureTransactions.begin(); iter !=mFutureTransactions.end(); )
{
if( (*iter)->ledgerindex() == ledgerIndex)
{
addTransaction(*iter);
mFutureTransactions.erase(iter);
}else iter++;
}
}
void LedgerMaster::checkLedgerProposal(Peer::pointer peer, newcoin::ProposeLedger& otherLedger)
{
// see if this matches yours