From b7d836a5dad1e79897ccafa457f8d0998eb8525d Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 28 May 2012 13:03:21 -0700
Subject: [PATCH] Revert "More LedgerAcquire work. Broadcast IHAVEs for tx
 sets."

This reverts commit 240386931ccb8433a6b269aa91c469f924d9724a.

Erroneous commit.
---
 src/LedgerAcquire.cpp | 50 +++++++++++++++++++++----------------------
 src/LedgerAcquire.h   |  4 ++--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp
index 34bd631e29..3228bbe488 100644
--- a/src/LedgerAcquire.cpp
+++ b/src/LedgerAcquire.cpp
@@ -117,9 +117,9 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 #ifdef DEBUG
 		std::cerr << "need base" << std::endl;
 #endif
-		newcoin::TMGetLedger tmGL;
-		tmGL.set_ledgerhash(mHash.begin(), mHash.size());
-		tmGL.set_itype(newcoin::liBASE);
+		boost::shared_ptr<newcoin::TMGetLedger> tmGL = boost::make_shared<newcoin::TMGetLedger>();
+		tmGL->set_ledgerhash(mHash.begin(), mHash.size());
+		tmGL->set_itype(newcoin::liBASE);
 		if (peer)
 		{
 			sendRequest(tmGL, peer);
@@ -136,11 +136,11 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 		assert(mLedger);
 		if (mLedger->peekTransactionMap()->getHash().isZero())
 		{ // we need the root node
-			newcoin::TMGetLedger tmGL;
-			tmGL.set_ledgerhash(mHash.begin(), mHash.size());
-			tmGL.set_ledgerseq(mLedger->getLedgerSeq());
-			tmGL.set_itype(newcoin::liTX_NODE);
-			*(tmGL.add_nodeids()) = SHAMapNode().getRawString();
+			boost::shared_ptr<newcoin::TMGetLedger> tmGL = boost::make_shared<newcoin::TMGetLedger>();
+			tmGL->set_ledgerhash(mHash.begin(), mHash.size());
+			tmGL->set_ledgerseq(mLedger->getLedgerSeq());
+			tmGL->set_itype(newcoin::liTX_NODE);
+			*(tmGL->add_nodeids()) = SHAMapNode().getRawString();
 			if (peer)
 			{
 				sendRequest(tmGL, peer);
@@ -164,12 +164,12 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 			}
 			else
 			{
-				newcoin::TMGetLedger tmGL;
-				tmGL.set_ledgerhash(mHash.begin(), mHash.size());
-				tmGL.set_ledgerseq(mLedger->getLedgerSeq());
-				tmGL.set_itype(newcoin::liTX_NODE);
+				boost::shared_ptr<newcoin::TMGetLedger> tmGL = boost::make_shared<newcoin::TMGetLedger>();
+				tmGL->set_ledgerhash(mHash.begin(), mHash.size());
+				tmGL->set_ledgerseq(mLedger->getLedgerSeq());
+				tmGL->set_itype(newcoin::liTX_NODE);
 				for (std::vector<SHAMapNode>::iterator it = nodeIDs.begin(); it != nodeIDs.end(); ++it)
-					*(tmGL.add_nodeids()) = it->getRawString();
+					*(tmGL->add_nodeids()) = it->getRawString();
 				if (peer)
 				{
 					sendRequest(tmGL, peer);
@@ -188,11 +188,11 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 		assert(mLedger);
 		if (mLedger->peekAccountStateMap()->getHash().isZero())
 		{ // we need the root node
-			newcoin::TMGetLedger tmGL;
-			tmGL.set_ledgerhash(mHash.begin(), mHash.size());
-			tmGL.set_ledgerseq(mLedger->getLedgerSeq());
-			tmGL.set_itype(newcoin::liAS_NODE);
-			*(tmGL.add_nodeids()) = SHAMapNode().getRawString();
+			boost::shared_ptr<newcoin::TMGetLedger> tmGL = boost::make_shared<newcoin::TMGetLedger>();
+			tmGL->set_ledgerhash(mHash.begin(), mHash.size());
+			tmGL->set_ledgerseq(mLedger->getLedgerSeq());
+			tmGL->set_itype(newcoin::liAS_NODE);
+			*(tmGL->add_nodeids()) = SHAMapNode().getRawString();
 			if (peer)
 			{
 				sendRequest(tmGL, peer);
@@ -216,12 +216,12 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 			}
 			else
 			{
-				newcoin::TMGetLedger tmGL;
-				tmGL.set_ledgerhash(mHash.begin(), mHash.size());
-				tmGL.set_ledgerseq(mLedger->getLedgerSeq());
-				tmGL.set_itype(newcoin::liAS_NODE);
+				boost::shared_ptr<newcoin::TMGetLedger> tmGL = boost::make_shared<newcoin::TMGetLedger>();
+				tmGL->set_ledgerhash(mHash.begin(), mHash.size());
+				tmGL->set_ledgerseq(mLedger->getLedgerSeq());
+				tmGL->set_itype(newcoin::liAS_NODE);
 				for (std::vector<SHAMapNode>::iterator it = nodeIDs.begin(); it != nodeIDs.end(); ++it)
-					*(tmGL.add_nodeids()) = it->getRawString();
+					*(tmGL->add_nodeids()) = it->getRawString();
 				if (peer)
 				{
 					sendRequest(tmGL, peer);
@@ -238,12 +238,12 @@ void LedgerAcquire::trigger(Peer::pointer peer)
 		resetTimer();
 }
 
-void PeerSet::sendRequest(const newcoin::TMGetLedger& tmGL, Peer::pointer peer)
+void PeerSet::sendRequest(boost::shared_ptr<newcoin::TMGetLedger> tmGL, Peer::pointer peer)
 {
 	peer->sendPacket(boost::make_shared<PackedMessage>(tmGL, newcoin::mtGET_LEDGER));
 }
 
-void PeerSet::sendRequest(const newcoin::TMGetLedger& tmGL)
+void PeerSet::sendRequest(boost::shared_ptr<newcoin::TMGetLedger> tmGL)
 {
 	boost::recursive_mutex::scoped_lock sl(mLock);
 	if (mPeers.empty()) return;
diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h
index 7e92d024f2..47b2915826 100644
--- a/src/LedgerAcquire.h
+++ b/src/LedgerAcquire.h
@@ -29,8 +29,8 @@ protected:
 	PeerSet(const uint256& hash, int interval);
 	virtual ~PeerSet() { ; }
 
-	void sendRequest(const newcoin::TMGetLedger& message);
-	void sendRequest(const newcoin::TMGetLedger& message, Peer::pointer peer);
+	void sendRequest(boost::shared_ptr<newcoin::TMGetLedger> message);
+	void sendRequest(boost::shared_ptr<newcoin::TMGetLedger> message, Peer::pointer peer);
 
 public:
 	const uint256& getHash() const		{ return mHash; }