From 61c904a3551b81ac79bb076c01d9e26466f248ea Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 16 Jun 2013 20:55:17 -0700 Subject: [PATCH] Remove unused Application class members --- src/cpp/ripple/ripple_Application.cpp | 54 ++++++++++++++++++--------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/src/cpp/ripple/ripple_Application.cpp b/src/cpp/ripple/ripple_Application.cpp index c99df463a2..cd9f1914aa 100644 --- a/src/cpp/ripple/ripple_Application.cpp +++ b/src/cpp/ripple/ripple_Application.cpp @@ -23,8 +23,9 @@ public: LocalCredentials& getLocalCredentials () { - return mLocalCredentials ; + return m_localCredentials ; } + NetworkOPs& getOPs () { return mNetOps; @@ -34,6 +35,7 @@ public: { return mIOService; } + boost::asio::io_service& getAuxService () { return mAuxService; @@ -43,46 +45,57 @@ public: { return mLedgerMaster; } + InboundLedgers& getInboundLedgers () { return m_inboundLedgers; } + TransactionMaster& getMasterTransaction () { return mMasterTransaction; } + NodeCache& getTempNodeCache () { return mTempNodeCache; } + HashedObjectStore& getHashedObjectStore () { return mHashedObjectStore; } + JobQueue& getJobQueue () { return mJobQueue; } + boost::recursive_mutex& getMasterLock () { return mMasterLock; } + LoadManager& getLoadManager () { return mLoadMgr; } + TXQueue& getTxnQueue () { return mTxnQueue; } + PeerDoor& getPeerDoor () { return *mPeerDoor; } + OrderBookDB& getOrderBookDB () { return mOrderBookDB; } + SLECache& getSLECache () { return mSLECache; @@ -92,30 +105,37 @@ public: { return *mFeatures; } + ILoadFeeTrack& getFeeTrack () { return *mFeeTrack; } + IFeeVote& getFeeVote () { return *mFeeVote; } + IHashRouter& getHashRouter () { return *mHashRouter; } + IValidations& getValidations () { return *mValidations; } + IUniqueNodeList& getUNL () { return *mUNL; } + IProofOfWorkFactory& getProofOfWorkFactory () { return *mProofOfWorkFactory; } + IPeers& getPeers () { return *mPeers; @@ -183,6 +203,7 @@ private: void startNewLedger (); bool loadOldLedger (const std::string&); +private: boost::asio::io_service mIOService; boost::asio::io_service mAuxService; boost::asio::io_service::work mIOWork; @@ -190,19 +211,19 @@ private: boost::recursive_mutex mMasterLock; - LocalCredentials mLocalCredentials; - LedgerMaster mLedgerMaster; + LocalCredentials m_localCredentials; + LedgerMaster mLedgerMaster; InboundLedgers m_inboundLedgers; - TransactionMaster mMasterTransaction; - NetworkOPs mNetOps; - NodeCache mTempNodeCache; - HashedObjectStore mHashedObjectStore; - SLECache mSLECache; - SNTPClient mSNTPClient; - JobQueue mJobQueue; - LoadManager mLoadMgr; - TXQueue mTxnQueue; - OrderBookDB mOrderBookDB; + TransactionMaster mMasterTransaction; + NetworkOPs mNetOps; + NodeCache mTempNodeCache; + HashedObjectStore mHashedObjectStore; + SLECache mSLECache; + SNTPClient mSNTPClient; + JobQueue mJobQueue; + LoadManager mLoadMgr; + TXQueue mTxnQueue; + OrderBookDB mOrderBookDB; // VFALCO Clean stuff beast::ScopedPointer mFeatures; @@ -234,10 +255,7 @@ private: boost::asio::deadline_timer mSweepTimer; - std::map mPeerMap; - boost::recursive_mutex mPeerMapLock; - - volatile bool mShutdown; + bool volatile mShutdown; }; Application::Application () @@ -474,7 +492,7 @@ void Application::setup () // Begin validation and ip maintenance. // - LocalCredentials maintains local information: including identity and network connection persistence information. // - mLocalCredentials.start (); + m_localCredentials.start (); // // Set up UNL.