From de8288d4d59e60d7a2e1283cdcf5083a3eeab043 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 13 Sep 2012 15:21:08 -0700
Subject: [PATCH] Cleanup transaction set sync map creation. Remove a
 passthrough to NetworkOPs that doesn't make much sense.

---
 src/LedgerConsensus.cpp | 18 ++++++++++--------
 src/NetworkOPs.cpp      |  6 ------
 src/NetworkOPs.h        |  1 -
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 515722b40..3d450295d 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -25,8 +25,7 @@ typedef std::pair<const uint256, LCTransaction::pointer> u256_lct_pair;
 
 TransactionAcquire::TransactionAcquire(const uint256& hash) : PeerSet(hash, TX_ACQUIRE_TIMEOUT), mHaveRoot(false)
 {
-	mMap = boost::make_shared<SHAMap>();
-	mMap->setSynching();
+	mMap = boost::make_shared<SHAMap>(hash);
 }
 
 void TransactionAcquire::done()
@@ -34,10 +33,10 @@ void TransactionAcquire::done()
 	if (mFailed)
 	{
 		Log(lsWARNING) << "Failed to acqiure TXs " << mHash;
-		theApp->getOPs().mapComplete(mHash, SHAMap::pointer());
+		mapComplete(mHash, SHAMap::pointer(), true);
 	}
 	else
-		theApp->getOPs().mapComplete(mHash, mMap);
+		mapComplete(mHash, mMap, true);
 }
 
 boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast()
@@ -376,7 +375,7 @@ void LedgerConsensus::takeInitialPosition(Ledger& initialLedger)
 }
 
 void LedgerConsensus::createDisputes(const SHAMap::pointer& m1, const SHAMap::pointer& m2)
-{
+{ // m2 must be immutable
 	SHAMap::SHAMapDiff differences;
 	m1->compare(m2, differences, 16384);
 	for (SHAMap::SHAMapDiff::iterator pos = differences.begin(), end = differences.end(); pos != end; ++pos)
@@ -419,7 +418,8 @@ void LedgerConsensus::mapComplete(const uint256& hash, const SHAMap::pointer& ma
 			assert((it2->first == mOurPosition->getCurrentHash()) && it2->second);
 			createDisputes(it2->second, map);
 		}
-		else assert(false); // We don't have our own position?!
+		else
+			assert(false); // We don't have our own position?!
 	}
 	mComplete[map->getHash()] = map;
 
@@ -868,8 +868,10 @@ bool LedgerConsensus::peerGaveNodes(Peer::ref peer, const uint256& setHash,
 	const std::list<SHAMapNode>& nodeIDs, const std::list< std::vector<unsigned char> >& nodeData)
 {
 	boost::unordered_map<uint256, TransactionAcquire::pointer>::iterator acq = mAcquiring.find(setHash);
-	if (acq == mAcquiring.end()) return false;
-	return acq->second->takeNodes(nodeIDs, nodeData, peer);
+	if (acq == mAcquiring.end())
+		return false;
+	return
+		acq->second->takeNodes(nodeIDs, nodeData, peer);
 }
 
 void LedgerConsensus::beginAccept()
diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index cf3873ba8..1ecfdfae2 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -712,12 +712,6 @@ bool NetworkOPs::hasTXSet(const boost::shared_ptr<Peer>& peer, const uint256& se
 	return mConsensus->peerHasSet(peer, set, status);
 }
 
-void NetworkOPs::mapComplete(const uint256& hash, const SHAMap::pointer& map)
-{
-	if (mConsensus)
-		mConsensus->mapComplete(hash, map, true);
-}
-
 void NetworkOPs::endConsensus(bool correctLCL)
 {
 	uint256 deadLedger = theApp->getMasterLedger().getClosedLedger()->getParentHash();
diff --git a/src/NetworkOPs.h b/src/NetworkOPs.h
index 04f4e731a..e41a8dc6d 100644
--- a/src/NetworkOPs.h
+++ b/src/NetworkOPs.h
@@ -171,7 +171,6 @@ public:
 	bool recvValidation(const SerializedValidation::pointer& val);
 	SHAMap::pointer getTXMap(const uint256& hash);
 	bool hasTXSet(const boost::shared_ptr<Peer>& peer, const uint256& set, newcoin::TxSetStatus status);
-	void mapComplete(const uint256& hash, const SHAMap::pointer& map);
 
 	// network state machine
 	void checkState(const boost::system::error_code& result);