From 6c131d86ab212d004c38281871a15b00fd0a76a5 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 1 May 2012 02:27:54 -0700
Subject: [PATCH] Cleanups mostly.

---
 src/Peer.cpp | 32 +++++++++++++++-----------------
 src/Peer.h   |  1 -
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Peer.cpp b/src/Peer.cpp
index b0c88f637..dbf3f0ba0 100644
--- a/src/Peer.cpp
+++ b/src/Peer.cpp
@@ -493,18 +493,15 @@ void Peer::recvHello(newcoin::TMHello& packet)
 		std::cerr << "Recv(Hello): Disconnect: Bad node public key." << std::endl;
 	}
 	else if (!mNodePublic.verifyNodePublic(mCookieHash, packet.nodeproof()))
-	{
-		// Unable to verify they have private key for claimed public key.
+	{ // Unable to verify they have private key for claimed public key.
 		std::cerr << "Recv(Hello): Disconnect: Failed to verify session." << std::endl;
 	}
 	else if (!theApp->getConnectionPool().peerConnected(shared_from_this(), mNodePublic))
-	{
-		// Already connected, self, or some other reason.
+	{ // Already connected, self, or some other reason.
 		std::cerr << "Recv(Hello): Disconnect: Extraneous connection." << std::endl;
 	}
 	else
-	{
-		// Successful connection.
+	{ // Successful connection.
 
 		// Cancel verification timeout.
 		(void) mVerifyTimer.cancel();
@@ -638,17 +635,17 @@ void Peer::recvGetLedger(newcoin::TMGetLedger& packet)
 	}
 	else if(packet.has_ledgerseq())
 		ledger=theApp->getMasterLedger().getLedgerBySeq(packet.ledgerseq());
-	else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCURRENT) )
+	else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCURRENT) )
 		ledger=theApp->getMasterLedger().getCurrentLedger();
-	else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCLOSING) )
+	else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCLOSING) )
 	{
-		ledger=theApp->getMasterLedger().getClosingLedger();
+		ledger = theApp->getMasterLedger().getClosedLedger();
 	}
-	else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCLOSED) )
+	else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCLOSED) )
 	{
-		ledger=theApp->getMasterLedger().getClosingLedger();
+		ledger = theApp->getMasterLedger().getClosedLedger();
 		if(ledger && !ledger->isClosed())
-			ledger=theApp->getMasterLedger().getLedgerBySeq(ledger->getLedgerSeq()-1);
+			ledger = theApp->getMasterLedger().getLedgerBySeq(ledger->getLedgerSeq() - 1);
 	}
 	else
 	{
@@ -767,7 +764,7 @@ void Peer::sendHello()
 
 	theApp->getWallet().getNodePrivate().signNodePrivate(mCookieHash, vchSig);
 
-	newcoin::TMHello* h=new newcoin::TMHello();
+	newcoin::TMHello* h = new newcoin::TMHello();
 
 	h->set_version(theConfig.VERSION);
 	h->set_ledgerindex(theApp->getOPs().getCurrentLedgerID());
@@ -776,15 +773,16 @@ void Peer::sendHello()
 	h->set_nodeproof(&vchSig[0], vchSig.size());
 	h->set_ipv4port(theConfig.PEER_PORT);
 
-	Ledger::pointer closingLedger=theApp->getMasterLedger().getClosingLedger();
-	if(closingLedger->isClosed())
+	Ledger::pointer closedLedger = theApp->getMasterLedger().getClosedLedger();
+	assert(closedLedger && closedLedger->isClosed());
+	if(closedLedger->isClosed())
 	{
 		Serializer s(128);
-		closingLedger->addRaw(s);
+		closedLedger->addRaw(s);
 		h->set_closedledger(s.getDataPtr(), s.getLength());
 	}
 
-	PackedMessage::pointer packet=boost::make_shared<PackedMessage>
+	PackedMessage::pointer packet = boost::make_shared<PackedMessage>
 		(PackedMessage::MessagePointer(h), newcoin::mtHELLO);
 	sendPacket(packet);
 }
diff --git a/src/Peer.h b/src/Peer.h
index f8992840c..87a517c55 100644
--- a/src/Peer.h
+++ b/src/Peer.h
@@ -48,7 +48,6 @@ protected:
 	std::vector<uint8_t> mReadbuf;
 	std::list<PackedMessage::pointer> mSendQ;
 	PackedMessage::pointer mSendingPacket;
-	std::bitset<32> mPeerBits;
 
 	Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx);