From 8a58d0e87d70580ae47da228e2f88cd53c40c675 Mon Sep 17 00:00:00 2001 From: glozow Date: Mon, 7 Jul 2025 13:12:01 -0400 Subject: [PATCH] scripted-diff: rename OrphanTxBase to OrphanInfo -BEGIN VERIFY SCRIPT- sed -i 's/OrphanTxBase/OrphanInfo/g' $(git grep -l 'OrphanTxBase') -END VERIFY SCRIPT- --- src/net_processing.cpp | 4 ++-- src/net_processing.h | 2 +- src/node/txdownloadman.h | 2 +- src/node/txdownloadman_impl.cpp | 4 ++-- src/node/txdownloadman_impl.h | 2 +- src/node/txorphanage.cpp | 8 ++++---- src/node/txorphanage.h | 6 +++--- src/rpc/mempool.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 10fbae5e7ed..65a70da089b 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -533,7 +533,7 @@ public: std::optional FetchBlock(NodeId peer_id, const CBlockIndex& block_index) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex); bool GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex); - std::vector GetOrphanTransactions() override EXCLUSIVE_LOCKS_REQUIRED(!m_tx_download_mutex); + std::vector GetOrphanTransactions() override EXCLUSIVE_LOCKS_REQUIRED(!m_tx_download_mutex); PeerManagerInfo GetInfo() const override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex); void SendPings() override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex); void RelayTransaction(const Txid& txid, const Wtxid& wtxid) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex); @@ -1754,7 +1754,7 @@ bool PeerManagerImpl::GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) c return true; } -std::vector PeerManagerImpl::GetOrphanTransactions() +std::vector PeerManagerImpl::GetOrphanTransactions() { LOCK(m_tx_download_mutex); return m_txdownloadman.GetOrphanTransactions(); diff --git a/src/net_processing.h b/src/net_processing.h index 9cf79512172..8c140d98ad6 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -109,7 +109,7 @@ public: /** Get statistics from node state */ virtual bool GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) const = 0; - virtual std::vector GetOrphanTransactions() = 0; + virtual std::vector GetOrphanTransactions() = 0; /** Get peer manager info. */ virtual PeerManagerInfo GetInfo() const = 0; diff --git a/src/node/txdownloadman.h b/src/node/txdownloadman.h index 3ebf66324a8..90dc0e343af 100644 --- a/src/node/txdownloadman.h +++ b/src/node/txdownloadman.h @@ -170,7 +170,7 @@ public: void CheckIsEmpty(NodeId nodeid) const; /** Wrapper for TxOrphanage::GetOrphanTransactions */ - std::vector GetOrphanTransactions() const; + std::vector GetOrphanTransactions() const; }; } // namespace node #endif // BITCOIN_NODE_TXDOWNLOADMAN_H diff --git a/src/node/txdownloadman_impl.cpp b/src/node/txdownloadman_impl.cpp index 38b949c654a..0105fe3d609 100644 --- a/src/node/txdownloadman_impl.cpp +++ b/src/node/txdownloadman_impl.cpp @@ -83,7 +83,7 @@ void TxDownloadManager::CheckIsEmpty(NodeId nodeid) const { m_impl->CheckIsEmpty(nodeid); } -std::vector TxDownloadManager::GetOrphanTransactions() const +std::vector TxDownloadManager::GetOrphanTransactions() const { return m_impl->GetOrphanTransactions(); } @@ -576,7 +576,7 @@ void TxDownloadManagerImpl::CheckIsEmpty() assert(m_txrequest.Size() == 0); assert(m_num_wtxid_peers == 0); } -std::vector TxDownloadManagerImpl::GetOrphanTransactions() const +std::vector TxDownloadManagerImpl::GetOrphanTransactions() const { return m_orphanage->GetOrphanTransactions(); } diff --git a/src/node/txdownloadman_impl.h b/src/node/txdownloadman_impl.h index b10c71d5d24..8af0cb227f5 100644 --- a/src/node/txdownloadman_impl.h +++ b/src/node/txdownloadman_impl.h @@ -188,7 +188,7 @@ public: void CheckIsEmpty(); void CheckIsEmpty(NodeId nodeid); - std::vector GetOrphanTransactions() const; + std::vector GetOrphanTransactions() const; protected: /** Helper for getting deduplicated vector of Txids in vin. */ diff --git a/src/node/txorphanage.cpp b/src/node/txorphanage.cpp index 9d386b9dc0b..3e07652abcc 100644 --- a/src/node/txorphanage.cpp +++ b/src/node/txorphanage.cpp @@ -229,7 +229,7 @@ public: std::vector> AddChildrenToWorkSet(const CTransaction& tx, FastRandomContext& rng) override; bool HaveTxToReconsider(NodeId peer) override; std::vector GetChildrenFromSamePeer(const CTransactionRef& parent, NodeId nodeid) const override; - std::vector GetOrphanTransactions() const override; + std::vector GetOrphanTransactions() const override; TxOrphanage::Usage TotalOrphanUsage() const override; void SanityCheck() const override; }; @@ -665,9 +665,9 @@ std::vector TxOrphanageImpl::GetChildrenFromSamePeer(const CTra return children_found; } -std::vector TxOrphanageImpl::GetOrphanTransactions() const +std::vector TxOrphanageImpl::GetOrphanTransactions() const { - std::vector result; + std::vector result; result.reserve(m_unique_orphans); auto& index_by_wtxid = m_orphans.get(); @@ -675,7 +675,7 @@ std::vector TxOrphanageImpl::GetOrphanTransactions() std::set this_orphan_announcers; while (it != index_by_wtxid.end()) { this_orphan_announcers.insert(it->m_announcer); - // If this is the last entry, or the next entry has a different wtxid, build a OrphanTxBase. + // If this is the last entry, or the next entry has a different wtxid, build a OrphanInfo. if (std::next(it) == index_by_wtxid.end() || std::next(it)->m_tx->GetWitnessHash() != it->m_tx->GetWitnessHash()) { result.emplace_back(it->m_tx, std::move(this_orphan_announcers)); this_orphan_announcers.clear(); diff --git a/src/node/txorphanage.h b/src/node/txorphanage.h index 24fa20bfe78..146e6730e89 100644 --- a/src/node/txorphanage.h +++ b/src/node/txorphanage.h @@ -41,13 +41,13 @@ public: using Count = unsigned int; /** Allows providing orphan information externally */ - struct OrphanTxBase { + struct OrphanInfo { CTransactionRef tx; /** Peers added with AddTx or AddAnnouncer. */ std::set announcers; // Constructor with moved announcers - OrphanTxBase(CTransactionRef tx, std::set&& announcers) : + OrphanInfo(CTransactionRef tx, std::set&& announcers) : tx(std::move(tx)), announcers(std::move(announcers)) {} @@ -99,7 +99,7 @@ public: virtual std::vector GetChildrenFromSamePeer(const CTransactionRef& parent, NodeId nodeid) const = 0; /** Get all orphan transactions */ - virtual std::vector GetOrphanTransactions() const = 0; + virtual std::vector GetOrphanTransactions() const = 0; /** Get the total usage (weight) of all orphans. If an orphan has multiple announcers, its usage is * only counted once within this total. */ diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp index 55104e4c766..d0c5ec65dbf 100644 --- a/src/rpc/mempool.cpp +++ b/src/rpc/mempool.cpp @@ -839,7 +839,7 @@ static std::vector OrphanDescription() }; } -static UniValue OrphanToJSON(const node::TxOrphanage::OrphanTxBase& orphan) +static UniValue OrphanToJSON(const node::TxOrphanage::OrphanInfo& orphan) { UniValue o(UniValue::VOBJ); o.pushKV("txid", orphan.tx->GetHash().ToString()); @@ -895,7 +895,7 @@ static RPCHelpMan getorphantxs() { const NodeContext& node = EnsureAnyNodeContext(request.context); PeerManager& peerman = EnsurePeerman(node); - std::vector orphanage = peerman.GetOrphanTransactions(); + std::vector orphanage = peerman.GetOrphanTransactions(); int verbosity{ParseVerbosity(request.params[0], /*default_verbosity=*/0, /*allow_bool*/false)};