Bugfix for moving from connected to tracking state.

Skeleting for getting Json info from consensus engine.
This commit is contained in:
JoelKatz
2012-08-06 03:40:52 -07:00
parent 85c0293673
commit efa3653b80
3 changed files with 14 additions and 6 deletions

View File

@@ -604,12 +604,6 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, uint
if (!theApp->isNew(s.getSHA512Half()))
return false;
if ((mMode != omFULL) && (mMode != omTRACKING))
{
Log(lsINFO) << "Received proposal when not full/tracking: " << mMode;
return true;
}
if (!mConsensus)
{ // FIXME: CLC
Log(lsWARNING) << "Received proposal when full but not during consensus window";
@@ -754,6 +748,9 @@ Json::Value NetworkOPs::getServerInfo()
if (!theConfig.VALIDATION_SEED.isValid()) info["serverState"] = "none";
else info["validationPKey"] = NewcoinAddress::createNodePublic(theConfig.VALIDATION_SEED).humanNodePublic();
if (mConsensus)
info["consensus"] = mConsensus->getJson();
return info;
}