From 14b2f27c3e7e6c24c579bac2eee9c5d4671f8443 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Wed, 26 May 2021 18:00:03 -0500 Subject: [PATCH] Remove dead code --- src/ripple/app/ledger/AcceptedLedger.cpp | 11 --------- src/ripple/app/ledger/AcceptedLedger.h | 3 --- src/ripple/app/ledger/LedgerMaster.h | 6 ----- src/ripple/app/ledger/LedgerReplayTask.h | 6 ----- .../app/ledger/impl/LedgerDeltaAcquire.h | 6 ----- src/ripple/app/ledger/impl/LedgerMaster.cpp | 7 ------ src/ripple/app/ledger/impl/SkipListAcquire.h | 6 ----- src/ripple/app/misc/NetworkOPs.cpp | 20 ---------------- src/ripple/app/misc/NetworkOPs.h | 3 --- src/ripple/net/AutoSocket.h | 10 -------- src/ripple/nodestore/Backend.h | 22 ++++++++---------- src/ripple/nodestore/Manager.h | 10 -------- .../nodestore/backend/CassandraFactory.cpp | 23 ------------------- .../nodestore/backend/MemoryFactory.cpp | 15 +----------- src/ripple/nodestore/backend/NuDBFactory.cpp | 6 ----- src/ripple/nodestore/backend/NullFactory.cpp | 11 --------- .../nodestore/backend/RocksDBFactory.cpp | 13 ----------- .../nodestore/impl/DatabaseRotatingImp.h | 6 ----- src/ripple/nodestore/impl/Shard.cpp | 11 --------- src/ripple/overlay/impl/OverlayImpl.h | 6 ----- src/ripple/overlay/impl/PeerImp.h | 3 --- src/ripple/peerfinder/impl/StoreSqdb.h | 2 ++ 22 files changed, 12 insertions(+), 194 deletions(-) diff --git a/src/ripple/app/ledger/AcceptedLedger.cpp b/src/ripple/app/ledger/AcceptedLedger.cpp index 7713403ef..41946f009 100644 --- a/src/ripple/app/ledger/AcceptedLedger.cpp +++ b/src/ripple/app/ledger/AcceptedLedger.cpp @@ -54,15 +54,4 @@ AcceptedLedger::insert(AcceptedLedgerTx::ref at) mMap.insert(std::make_pair(at->getIndex(), at)); } -AcceptedLedgerTx::pointer -AcceptedLedger::getTxn(int i) const -{ - map_t::const_iterator it = mMap.find(i); - - if (it == mMap.end()) - return AcceptedLedgerTx::pointer(); - - return it->second; -} - } // namespace ripple diff --git a/src/ripple/app/ledger/AcceptedLedger.h b/src/ripple/app/ledger/AcceptedLedger.h index 16703bc5f..057501369 100644 --- a/src/ripple/app/ledger/AcceptedLedger.h +++ b/src/ripple/app/ledger/AcceptedLedger.h @@ -69,9 +69,6 @@ public: return mMap.size(); } - AcceptedLedgerTx::pointer - getTxn(int) const; - AcceptedLedger( std::shared_ptr const& ledger, Application& app); diff --git a/src/ripple/app/ledger/LedgerMaster.h b/src/ripple/app/ledger/LedgerMaster.h index e886c4651..bb29456e3 100644 --- a/src/ripple/app/ledger/LedgerMaster.h +++ b/src/ripple/app/ledger/LedgerMaster.h @@ -70,10 +70,6 @@ public: class LedgerMaster : public AbstractFetchPackContainer { public: - // Age for last validated ledger if the process has yet to validate. - static constexpr std::chrono::seconds NO_VALIDATED_LEDGER_AGE = - std::chrono::hours{24 * 14}; - explicit LedgerMaster( Application& app, Stopwatch& stopwatch, @@ -240,8 +236,6 @@ public: uint256 const& consensusHash, Json::Value consensus); - LedgerIndex - getBuildingLedger(); void setBuildingLedger(LedgerIndex index); diff --git a/src/ripple/app/ledger/LedgerReplayTask.h b/src/ripple/app/ledger/LedgerReplayTask.h index 34abb5771..4330f0b62 100644 --- a/src/ripple/app/ledger/LedgerReplayTask.h +++ b/src/ripple/app/ledger/LedgerReplayTask.h @@ -129,12 +129,6 @@ public: bool finished() const; - static char const* - getCountedObjectName() - { - return "LedgerReplayTask"; - } - private: void onTimer(bool progress, ScopedLockType& sl) override; diff --git a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h b/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h index bc558d61d..2f767cf27 100644 --- a/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h +++ b/src/ripple/app/ledger/impl/LedgerDeltaAcquire.h @@ -111,12 +111,6 @@ public: void addDataCallback(InboundLedger::Reason reason, OnDeltaDataCB&& cb); - static char const* - getCountedObjectName() - { - return "LedgerDeltaAcquire"; - } - private: void onTimer(bool progress, ScopedLockType& peerSetLock) override; diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp index 2c9aa150d..2963243d9 100644 --- a/src/ripple/app/ledger/impl/LedgerMaster.cpp +++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp @@ -580,13 +580,6 @@ LedgerMaster::popAcctTransaction(std::shared_ptr const& tx) return mHeldTransactions.popAcctTransaction(tx); } -LedgerIndex -LedgerMaster::getBuildingLedger() -{ - // The ledger we are currently building, 0 of none - return mBuildingLedgerSeq.load(); -} - void LedgerMaster::setBuildingLedger(LedgerIndex i) { diff --git a/src/ripple/app/ledger/impl/SkipListAcquire.h b/src/ripple/app/ledger/impl/SkipListAcquire.h index d5e3d317c..3901e1080 100644 --- a/src/ripple/app/ledger/impl/SkipListAcquire.h +++ b/src/ripple/app/ledger/impl/SkipListAcquire.h @@ -109,12 +109,6 @@ public: std::shared_ptr getData() const; - static char const* - getCountedObjectName() - { - return "SkipListAcquire"; - } - private: void onTimer(bool progress, ScopedLockType& peerSetLock) override; diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index 972b9329e..135283dc0 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -142,8 +142,6 @@ class NetworkOPsImp final : public NetworkOPs std::chrono::system_clock::time_point start_ = std::chrono::system_clock::now(); static std::array const states_; - static Json::StaticString const transitions_; - static Json::StaticString const dur_; public: explicit StateAccounting() @@ -229,7 +227,6 @@ public: beast::Journal journal, beast::insight::Collector::ptr const& collector) : app_(app) - , m_clock(clock) , m_journal(journal) , m_localTX(make_LocalTxs()) , mMode(start_valid ? OperatingMode::FULL : OperatingMode::DISCONNECTED) @@ -362,14 +359,6 @@ public: std::shared_ptr const& val, std::string const& source) override; - std::shared_ptr - getTXMap(uint256 const& hash); - bool - hasTXSet( - const std::shared_ptr& peer, - uint256 const& set, - protocol::TxSetStatus status); - void mapComplete(std::shared_ptr const& map, bool fromAcquire) override; @@ -440,8 +429,6 @@ public: std::uint32_t acceptLedger( std::optional consensusDelay) override; - uint256 - getConsensusLCL() override; void reportFeeChange() override; void @@ -618,7 +605,6 @@ private: using subRpcMapType = hash_map; Application& app_; - clock_type& m_clock; beast::Journal m_journal; std::unique_ptr m_localTX; @@ -1740,12 +1726,6 @@ NetworkOPsImp::beginConsensus(uint256 const& networkClosed) return true; } -uint256 -NetworkOPsImp::getConsensusLCL() -{ - return mConsensus.prevLedgerID(); -} - bool NetworkOPsImp::processTrustedProposal(RCLCxPeerPos peerPos) { diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h index f49b1dd52..444da2cc8 100644 --- a/src/ripple/app/misc/NetworkOPs.h +++ b/src/ripple/app/misc/NetworkOPs.h @@ -239,9 +239,6 @@ public: std::optional consensusDelay = std::nullopt) = 0; - virtual uint256 - getConsensusLCL() = 0; - virtual void reportFeeChange() = 0; diff --git a/src/ripple/net/AutoSocket.h b/src/ripple/net/AutoSocket.h index edb4ffac0..e64c7a1e5 100644 --- a/src/ripple/net/AutoSocket.h +++ b/src/ripple/net/AutoSocket.h @@ -77,16 +77,6 @@ public: { return mSocket->next_layer(); } - void - setSSLOnly() - { - mSecure = true; - } - void - setPlainOnly() - { - mBuffer.clear(); - } beast::IP::Endpoint local_endpoint() diff --git a/src/ripple/nodestore/Backend.h b/src/ripple/nodestore/Backend.h index 117efb9d2..d773be741 100644 --- a/src/ripple/nodestore/Backend.h +++ b/src/ripple/nodestore/Backend.h @@ -120,10 +120,6 @@ public: virtual Status fetch(void const* key, std::shared_ptr* pObject) = 0; - /** Return `true` if batch fetches are optimized. */ - virtual bool - canFetchBatch() = 0; - /** Fetch a batch synchronously. */ virtual std::pair>, Status> fetchBatch(std::vector const& hashes) = 0; @@ -164,9 +160,16 @@ public: virtual void setDeletePath() = 0; - /** Perform consistency checks on database. */ + /** Perform consistency checks on database. + * + * This method is implemented only by NuDBBackend. It is not yet called + * anywhere, but it might be a good idea to one day call it at startup to + * avert a crash. + */ virtual void - verify() = 0; + verify() + { + } /** Returns the number of file descriptors the backend expects to need. */ virtual int @@ -182,13 +185,6 @@ public: { return std::nullopt; } - - /** Returns true if the backend uses permanent storage. */ - bool - backed() const - { - return fdRequired(); - } }; } // namespace NodeStore diff --git a/src/ripple/nodestore/Manager.h b/src/ripple/nodestore/Manager.h index d28fd2bca..26fdc8789 100644 --- a/src/ripple/nodestore/Manager.h +++ b/src/ripple/nodestore/Manager.h @@ -102,16 +102,6 @@ public: beast::Journal journal) = 0; }; -//------------------------------------------------------------------------------ - -/** Create a Backend. */ -std::unique_ptr -make_Backend( - Section const& config, - std::size_t burstSize, - Scheduler& scheduler, - beast::Journal journal); - } // namespace NodeStore } // namespace ripple diff --git a/src/ripple/nodestore/backend/CassandraFactory.cpp b/src/ripple/nodestore/backend/CassandraFactory.cpp index ff57c983a..43170942c 100644 --- a/src/ripple/nodestore/backend/CassandraFactory.cpp +++ b/src/ripple/nodestore/backend/CassandraFactory.cpp @@ -578,12 +578,6 @@ public: return ok; } - bool - canFetchBatch() override - { - return true; - } - struct ReadCallbackData { CassandraBackend& backend; @@ -815,11 +809,6 @@ public: { } - void - verify() override - { - } - int fdRequired() const override { @@ -990,18 +979,6 @@ public: { return std::make_unique(keyBytes, keyValues, journal); } - - std::unique_ptr - createInstance( - size_t keyBytes, - Section const& keyValues, - std::size_t burstSize, - Scheduler& scheduler, - nudb::context& context, - beast::Journal journal) override - { - return std::make_unique(keyBytes, keyValues, journal); - } }; static CassandraFactory cassandraFactory; diff --git a/src/ripple/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp index e9433fd49..831ce6c38 100644 --- a/src/ripple/nodestore/backend/MemoryFactory.cpp +++ b/src/ripple/nodestore/backend/MemoryFactory.cpp @@ -89,7 +89,6 @@ public: MemoryBackend( size_t keyBytes, Section const& keyValues, - Scheduler& scheduler, beast::Journal journal) : name_(get(keyValues, "path")), journal_(journal) { @@ -147,12 +146,6 @@ public: return ok; } - bool - canFetchBatch() override - { - return false; - } - std::pair>, Status> fetchBatch(std::vector const& hashes) override { @@ -210,11 +203,6 @@ public: { } - void - verify() override - { - } - int fdRequired() const override { @@ -248,8 +236,7 @@ MemoryFactory::createInstance( Scheduler& scheduler, beast::Journal journal) { - return std::make_unique( - keyBytes, keyValues, scheduler, journal); + return std::make_unique(keyBytes, keyValues, journal); } } // namespace NodeStore diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp index 7215316f3..084da8882 100644 --- a/src/ripple/nodestore/backend/NuDBFactory.cpp +++ b/src/ripple/nodestore/backend/NuDBFactory.cpp @@ -210,12 +210,6 @@ public: return status; } - bool - canFetchBatch() override - { - return true; - } - std::pair>, Status> fetchBatch(std::vector const& hashes) override { diff --git a/src/ripple/nodestore/backend/NullFactory.cpp b/src/ripple/nodestore/backend/NullFactory.cpp index 453d290d3..8509787b3 100644 --- a/src/ripple/nodestore/backend/NullFactory.cpp +++ b/src/ripple/nodestore/backend/NullFactory.cpp @@ -60,12 +60,6 @@ public: return notFound; } - bool - canFetchBatch() override - { - return false; - } - std::pair>, Status> fetchBatch(std::vector const& hashes) override { @@ -103,11 +97,6 @@ public: { } - void - verify() override - { - } - /** Returns the number of file descriptors the backend expects to need */ int fdRequired() const override diff --git a/src/ripple/nodestore/backend/RocksDBFactory.cpp b/src/ripple/nodestore/backend/RocksDBFactory.cpp index bf3f5e6a9..cdc7b2158 100644 --- a/src/ripple/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple/nodestore/backend/RocksDBFactory.cpp @@ -88,7 +88,6 @@ private: public: beast::Journal m_journal; size_t const m_keyBytes; - Scheduler& m_scheduler; BatchWriter m_batch; std::string m_name; std::unique_ptr m_db; @@ -104,7 +103,6 @@ public: : m_deletePath(false) , m_journal(journal) , m_keyBytes(keyBytes) - , m_scheduler(scheduler) , m_batch(*this, scheduler) { if (!get_if_exists(keyValues, "path", m_name)) @@ -305,12 +303,6 @@ public: return status; } - bool - canFetchBatch() override - { - return false; - } - std::pair>, Status> fetchBatch(std::vector const& hashes) override { @@ -425,11 +417,6 @@ public: storeBatch(batch); } - void - verify() override - { - } - /** Returns the number of file descriptors the backend expects to need */ int fdRequired() const override diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.h b/src/ripple/nodestore/impl/DatabaseRotatingImp.h index 44b257dd0..985344102 100644 --- a/src/ripple/nodestore/impl/DatabaseRotatingImp.h +++ b/src/ripple/nodestore/impl/DatabaseRotatingImp.h @@ -84,12 +84,6 @@ private: std::shared_ptr archiveBackend_; mutable std::mutex mutex_; - struct Backends - { - std::shared_ptr const& writableBackend; - std::shared_ptr const& archiveBackend; - }; - std::shared_ptr fetchNodeObject( uint256 const& hash, diff --git a/src/ripple/nodestore/impl/Shard.cpp b/src/ripple/nodestore/impl/Shard.cpp index 378af695e..d82188cb7 100644 --- a/src/ripple/nodestore/impl/Shard.cpp +++ b/src/ripple/nodestore/impl/Shard.cpp @@ -585,17 +585,6 @@ Shard::finalize(bool writeSQLite, std::optional const& referenceHash) try { - /* - TODO MP - A lock is required when calling the NuDB verify function. Because - this can be a time consuming process, the server may desync. - Until this function is modified to work on an open database, we - are unable to use it from rippled. - - // Verify backend integrity - backend_->verify(); - */ - // Check if a final key has been stored if (std::shared_ptr nodeObject; backend_->fetch(finalKey.data(), &nodeObject) == Status::ok) diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h index f58148d57..96dbba833 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/ripple/overlay/impl/OverlayImpl.h @@ -171,12 +171,6 @@ public: return m_resourceManager; } - ServerHandler& - serverHandler() - { - return serverHandler_; - } - Setup const& setup() const { diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h index ccfaa3176..a75c497a2 100644 --- a/src/ripple/overlay/impl/PeerImp.h +++ b/src/ripple/overlay/impl/PeerImp.h @@ -447,9 +447,6 @@ private: std::string domain() const; - std::optional - networkID() const; - // // protocol message loop // diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/ripple/peerfinder/impl/StoreSqdb.h index c03191ccd..7d43136ae 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/ripple/peerfinder/impl/StoreSqdb.h @@ -22,6 +22,8 @@ #include #include +#include +#include #include namespace ripple {