From c05e42ccb7bc0490bcd854b2cc5696dac2520041 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 16 Oct 2012 05:28:41 -0700
Subject: [PATCH] Change "deferred proposal" to "stored". Complete move to
 NetworkOPs.

---
 src/NetworkOPs.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index af155ae692..883ca81538 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -661,7 +661,6 @@ int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::pointer clo
 	prevLedger->setImmutable();
 	mConsensus = boost::make_shared<LedgerConsensus>(
 		networkClosed, prevLedger, mLedgerMaster->getCurrentLedger()->getCloseTimeNC());
-	mConsensus->swapDefer(mDeferredProposals);
 
 	cLog(lsDEBUG) << "Initiating consensus engine";
 	return mConsensus->startup();
@@ -731,7 +730,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, cons
 		}
 		if (prevLedger == mConsensus->getLCL())
 			return mConsensus->peerPosition(proposal);
-		mConsensus->deferProposal(proposal, nodePublic);
+		storeProposal(proposal, nodePublic);
 		return false;
 	}
 
@@ -741,7 +740,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, cons
 	{ // Note that if the LCL is different, the signature check will fail
 		cLog(lsWARNING) << "Ledger proposal fails signature check";
 		proposal->setSignature(signature);
-		mConsensus->deferProposal(proposal, nodePublic);
+		storeProposal(proposal, nodePublic);
 		return false;
 	}
 	return mConsensus->peerPosition(proposal);
@@ -788,7 +787,6 @@ void NetworkOPs::endConsensus(bool correctLCL)
 			cLog(lsTRACE) << "Killing obsolete peer status";
 			it->cycleStatus();
 		}
-	mConsensus->swapDefer(mDeferredProposals);
 	mConsensus = boost::shared_ptr<LedgerConsensus>();
 }
 
@@ -1247,6 +1245,14 @@ uint32 NetworkOPs::acceptLedger()
 	return mLedgerMaster->getCurrentLedger()->getLedgerSeq();
 }
 
+void NetworkOPs::storeProposal(const LedgerProposal::pointer& proposal, const NewcoinAddress& peerPublic)
+{
+	std::list<LedgerProposal::pointer>& props = mStoredProposals[peerPublic.getNodeID()];
+	if (props.size() >= (mLastCloseProposers + 10))
+		props.pop_front();
+	props.push_back(proposal);
+}
+
 #if 0
 void NetworkOPs::subAccountChanges(InfoSub* ispListener, const uint256 uLedgerHash)
 {