From 40e0dba6b6d0b2b154deeaca2825a01324e416fc Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 16 Jul 2012 13:25:38 -0700
Subject: [PATCH] Simplify timing.

---
 src/LedgerConsensus.cpp | 15 +++++----------
 src/LedgerConsensus.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index b9315eb979..378908b0e4 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -362,7 +362,7 @@ int LedgerConsensus::startup()
 	return 1;
 }
 
-int LedgerConsensus::statePreClose()
+void LedgerConsensus::statePreClose()
 { // it is shortly before ledger close time
 	bool anyTransactions = theApp->getMasterLedger().getCurrentLedger()->peekTransactionMap()->getHash().isNonZero();
 	int proposersClosed = mPeerPositions.size();
@@ -382,13 +382,12 @@ int LedgerConsensus::statePreClose()
 		assert (initial->getParentHash() == mPreviousLedger->getHash());
 		takeInitialPosition(initial);
 	}
-	return 1;
 }
 
-int LedgerConsensus::stateEstablish()
+void LedgerConsensus::stateEstablish()
 { // we are establishing consensus
 	if (mCurrentSeconds < LEDGER_MIN_CONSENSUS)
-		return 1;
+		return;
 	updateOurPositions();
 	if (!mHaveCloseTimeConsensus)
 	{
@@ -400,10 +399,9 @@ int LedgerConsensus::stateEstablish()
 		mState = lcsFINISHED;
 		beginAccept();
 	}
-	return 1;
 }
 
-int LedgerConsensus::stateFinished()
+void LedgerConsensus::stateFinished()
 { // we are processing the finished ledger
 	// logic of calculating next ledger advances us out of this state
 
@@ -411,14 +409,11 @@ int LedgerConsensus::stateFinished()
 	int convergeTime = (boost::posix_time::second_clock::universal_time() - mConsensusStartTime).seconds();
 	if (convergeTime <= 0) convergeTime = 1;
 	theApp->getOPs().newLCL(mPeerPositions.size(), convergeTime, mNewLedgerHash);
-
-	return 1;
 }
 
-int LedgerConsensus::stateAccepted()
+void LedgerConsensus::stateAccepted()
 { // we have accepted a new ledger
 	endConsensus();
-	return 4;
 }
 
 void LedgerConsensus::timerEntry()
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index 92b10c51f9..235c670686 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -153,11 +153,11 @@ public:
 	void timerEntry();
 
 	// state handlers
-	int statePreClose();
-	int stateEstablish();
-	int stateCutoff();
-	int stateFinished();
-	int stateAccepted();
+	void statePreClose();
+	void stateEstablish();
+	void stateCutoff();
+	void stateFinished();
+	void stateAccepted();
 
 	bool haveConsensus();