From efa3653b800ecfd931bd34ab343bf6867bec005d Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 6 Aug 2012 03:40:52 -0700
Subject: [PATCH] Bugfix for moving from connected to tracking state. Skeleting
 for getting Json info from consensus engine.

---
 src/LedgerConsensus.cpp | 8 ++++++++
 src/LedgerConsensus.h   | 3 +++
 src/NetworkOPs.cpp      | 9 +++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 8a9bf82635..93229b5e42 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -956,4 +956,12 @@ void LedgerConsensus::endConsensus()
 {
 	theApp->getOPs().endConsensus(mHaveCorrectLCL);
 }
+
+Json::Value LedgerConsensus::getJson()
+{
+	Json::Value ret(Json::objectValue);
+
+	return ret;
+}
+
 // vim:ts=4
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index 6f167e72d4..205a75cd1a 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -8,6 +8,8 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/unordered/unordered_map.hpp>
 
+#include "../json/value.h"
+
 #include "key.h"
 #include "Transaction.h"
 #include "LedgerAcquire.h"
@@ -142,6 +144,7 @@ public:
 	LedgerConsensus(const uint256& prevLCLHash, Ledger::pointer previousLedger, uint32 closeTime);
 
 	int startup();
+	Json::Value getJson();
 
 	Ledger::pointer peekPreviousLedger()	{ return mPreviousLedger; }
 	uint256 getLCL()						{ return mPrevLedgerHash; }
diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index c6be046c41..875834a1e5 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -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;
 }