ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-12-13 16:55:50 -08:00
parent df4d2ec149 f8e98694c6
commit 38650ec819
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -300,7 +300,7 @@ LedgerConsensus::LedgerConsensus(const uint256& prevLCLHash, Ledger::ref previou
handleLCL(mPrevLedgerHash);
if (!mHaveCorrectLCL)
{
mProposing = mValidating = false;
// mProposing = mValidating = false;
cLog(lsINFO) << "Entering consensus with: " << previousLedger->getHash();
cLog(lsINFO) << "Correct LCL is: " << prevLCLHash;
}
@@ -331,8 +331,10 @@ void LedgerConsensus::checkOurValidation()
std::vector<unsigned char> validation = v->getSigned();
ripple::TMValidation val;
val.set_validation(&validation[0], validation.size());
#if 0
theApp->getConnectionPool().relayMessage(NULL,
boost::make_shared<PackedMessage>(val, ripple::mtVALIDATION));
#endif
theApp->getOPs().setLastValidation(v);
cLog(lsWARNING) << "Sending partial validation";
}
@@ -397,7 +399,7 @@ void LedgerConsensus::handleLCL(const uint256& lclHash)
propose();
}
mProposing = false;
mValidating = false;
// mValidating = false;
mPeerPositions.clear();
mDisputes.clear();
mCloseTimes.clear();