From 7e7356c15530b029c7e697731a6fbfd3a8717fb5 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 16 Jul 2012 00:47:46 -0700
Subject: [PATCH] Cleanups and bugfixes.

---
 src/LedgerConsensus.cpp | 10 ++--------
 src/LedgerConsensus.h   |  2 --
 src/LedgerTiming.cpp    |  2 +-
 src/NetworkOPs.cpp      | 18 ++----------------
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index ae3fc096f5..76b9ad9ce6 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -198,6 +198,7 @@ LedgerConsensus::LedgerConsensus(const uint256& prevLCLHash, Ledger::pointer pre
 	Log(lsTRACE) << "LCL:" << previousLedger->getHash().GetHex() <<", ct=" << closeTime;
 	mPreviousProposers = theApp->getOPs().getPreviousProposers();
 	mPreviousSeconds = theApp->getOPs().getPreviousSeconds();
+	assert(mPreviousSeconds);
 
 	mCloseResolution = ContinuousLedgerTiming::getNextLedgerTimeResolution(
 		previousLedger->getCloseResolution(), previousLedger->getCloseAgree(), previousLedger->getLedgerSeq() + 1);
@@ -356,12 +357,6 @@ void LedgerConsensus::statusChange(newcoin::NodeEvent event, Ledger::pointer led
 	Log(lsINFO) << "send status change to peer";
 }
 
-void LedgerConsensus::abort()
-{
-	Log(lsWARNING) << "consensus aborted";
-	mState = lcsABORTED;
-}
-
 int LedgerConsensus::startup()
 {
 	// create wobble ledger in case peers target transactions to it
@@ -433,7 +428,7 @@ void LedgerConsensus::timerEntry()
 {
 	if (!mHaveCorrectLCL)
 	{
-		Log(lsINFO) << "Checking if we have the consensus ledger";
+		Log(lsINFO) << "Checking for consensus ledger " << mPrevLedgerHash.GetHex();
 		Ledger::pointer consensus = theApp->getMasterLedger().getLedgerByHash(mPrevLedgerHash);
 		if (consensus)
 		{
@@ -455,7 +450,6 @@ void LedgerConsensus::timerEntry()
 		case lcsESTABLISH:	stateEstablish();	return;
 		case lcsFINISHED:	stateFinished();	return;
 		case lcsACCEPTED:	stateAccepted();	return;
-		case lcsABORTED:	return;
 	}
 	assert(false);
 }
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index 079a4a5d4e..92b10c51f9 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -72,7 +72,6 @@ enum LCState
 	lcsESTABLISH,		// Establishing consensus
 	lcsFINISHED,		// We have closed on a transaction set
 	lcsACCEPTED,		// We have accepted/validated a new last closed ledger
-	lcsABORTED			// Abandoned
 };
 
 class LedgerConsensus : public boost::enable_shared_from_this<LedgerConsensus>
@@ -151,7 +150,6 @@ public:
 	TransactionAcquire::pointer getAcquiring(const uint256& hash);
 	void mapComplete(const uint256& hash, SHAMap::pointer map, bool acquired);
 
-	void abort();
 	void timerEntry();
 
 	// state handlers
diff --git a/src/LedgerTiming.cpp b/src/LedgerTiming.cpp
index e9f2796148..360ae2d341 100644
--- a/src/LedgerTiming.cpp
+++ b/src/LedgerTiming.cpp
@@ -23,7 +23,7 @@ int ContinuousLedgerTiming::shouldClose(
 	assert((currentSeconds >= 0) && (currentSeconds < 600));
 
 #if 0
-	Log(lsTRACE) << boost::str(boost::format("CLC::shouldClose Trans=%s, Prop: %d/%d, Secs: %d/%d") %
+	Log(lsTRACE) << boost::str(boost::format("CLC::shouldClose Trans=%s, Prop: %d/%d, Secs: %d (last:%d)") %
 		(anyTransactions ? "yes" : "no") % previousProposers % proposersClosed % currentSeconds % previousSeconds);
 #endif
 
diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index e9113ae1e1..9fa2032334 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -459,12 +459,6 @@ void NetworkOPs::switchLastClosedLedger(Ledger::pointer newLedger)
 
 	Log(lsERROR) << "ABNORMAL Switching last closed ledger to " << newLedger->getHash().GetHex();
 
-	if (mConsensus)
-	{
-		mConsensus->abort();
-		mConsensus = boost::shared_ptr<LedgerConsensus>();
-	}
-
 	newLedger->setClosed();
 	Ledger::pointer openLedger = boost::make_shared<Ledger>(false, boost::ref(*newLedger));
 	mLedgerMaster->switchLedgers(newLedger, openLedger);
@@ -497,8 +491,7 @@ int NetworkOPs::beginConsensus(const uint256& networkClosed, Ledger::pointer clo
 	assert(closingLedger->getParentHash() == mLedgerMaster->getClosedLedger()->getHash());
 
 	// Create a consensus object to get consensus on this ledger
-	if (!!mConsensus)
-		mConsensus->abort();
+	assert(!mConsensus);
 	prevLedger->setImmutable();
 	mConsensus = boost::make_shared<LedgerConsensus>(
 		networkClosed, prevLedger, theApp->getMasterLedger().getCurrentLedger()->getCloseTimeNC());
@@ -600,14 +593,6 @@ void NetworkOPs::setMode(OperatingMode om)
 	if (mMode == om) return;
 	if ((om >= omCONNECTED) && (mMode == omDISCONNECTED))
 		mConnectTime = boost::posix_time::second_clock::universal_time();
-	if (mMode == omFULL)
-	{
-		if (mConsensus)
-		{
-			mConsensus->abort();
-			mConsensus = boost::shared_ptr<LedgerConsensus>();
-		}
-	}
 	Log l((om < mMode) ? lsWARNING : lsINFO);
 	if (om == omDISCONNECTED) l << "STATE->Disonnected";
 	else if (om == omCONNECTED) l << "STATE->Connected";
@@ -968,6 +953,7 @@ void NetworkOPs::unsubAccountTransaction(InfoSub* ispListener, const boost::unor
 
 void NetworkOPs::newLCL(int proposers, int convergeTime, const uint256& ledgerHash)
 {
+	assert(convergeTime);
 	mLastCloseProposers = proposers;
 	mLastCloseConvergeTime = convergeTime;
 	mLastCloseHash = ledgerHash;