diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp index fe5e72c1e4..5bf98283f7 100644 --- a/src/LedgerAcquire.cpp +++ b/src/LedgerAcquire.cpp @@ -238,12 +238,12 @@ void LedgerAcquire::trigger(Peer::pointer peer) resetTimer(); } -void LedgerAcquire::sendRequest(boost::shared_ptr tmGL, Peer::pointer peer) +void PeerSet::sendRequest(boost::shared_ptr tmGL, Peer::pointer peer) { peer->sendPacket(boost::make_shared(tmGL, newcoin::mtGET_LEDGER)); } -void LedgerAcquire::sendRequest(boost::shared_ptr tmGL) +void PeerSet::sendRequest(boost::shared_ptr tmGL) { boost::recursive_mutex::scoped_lock sl(mLock); if (mPeers.empty()) return; diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h index c2e3f74a6e..47b2915826 100644 --- a/src/LedgerAcquire.h +++ b/src/LedgerAcquire.h @@ -29,6 +29,9 @@ protected: PeerSet(const uint256& hash, int interval); virtual ~PeerSet() { ; } + void sendRequest(boost::shared_ptr message); + void sendRequest(boost::shared_ptr message, Peer::pointer peer); + public: const uint256& getHash() const { return mHash; } bool isComplete() const { return mComplete; } @@ -64,8 +67,6 @@ protected: void done(); void onTimer() { trigger(Peer::pointer()); } - void sendRequest(boost::shared_ptr message); - void sendRequest(boost::shared_ptr message, Peer::pointer peer); void newPeer(Peer::pointer peer) { trigger(peer); } void trigger(Peer::pointer); @@ -88,29 +89,6 @@ public: Peer::pointer); }; -class TransactionAcquire : public PeerSet, public boost::enable_shared_from_this -{ // A transaction set we are trying to acquire -public: - typedef boost::shared_ptr pointer; - -protected: - SHAMap::pointer mMap; - - void onTimer() { trigger(Peer::pointer()); } - void newPeer(Peer::pointer peer) { trigger(peer); } - - void done(); - void trigger(Peer::pointer); - boost::weak_ptr pmDowncast(); - -public: - TransactionAcquire(const uint256& hash); - SHAMap::pointer getMap(); - - bool takeNode(const std::list& IDs, const std::list >& data, - Peer::pointer); -}; - class LedgerAcquireMaster { protected: