Skip to content

Commit a02e843

Browse files
committed
refactor: privatise RequestObject and EraseObjectRequest
RequestObject is not used outside PeerManagerImpl and EraseObjectRequest is now brokered by `MessageProcessingResult`, so we can remove both from the interface and keep them as implementation details.
1 parent f95b50a commit a02e843

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/net_processing.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,6 @@ class PeerManagerImpl final : public PeerManager
639639
EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex);
640640
void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) override;
641641
bool IsBanned(NodeId pnode) override EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
642-
void EraseObjectRequest(NodeId nodeid, const CInv& inv) override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
643-
void RequestObject(NodeId nodeid, const CInv& inv, std::chrono::microseconds current_time,
644-
bool fForce = false) override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
645642
size_t GetRequestedObjectCount(NodeId nodeid) const override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
646643
private:
647644
void _RelayTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
@@ -658,6 +655,11 @@ class PeerManagerImpl final : public PeerManager
658655
*/
659656
void RelayInvFiltered(const CInv& inv, const uint256& relatedTxHash, const int minProtoVersion) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
660657

658+
void EraseObjectRequest(NodeId nodeid, const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
659+
660+
void RequestObject(NodeId nodeid, const CInv& inv, std::chrono::microseconds current_time, bool fForce = false)
661+
EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
662+
661663
/** Helper to process result of external handlers of message */
662664
void PostProcessMessage(MessageProcessingResult&& ret, NodeId node) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
663665

src/net_processing.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
127127

128128
virtual bool IsBanned(NodeId pnode) = 0;
129129

130-
virtual void EraseObjectRequest(NodeId nodeid, const CInv& inv) = 0;
131-
virtual void RequestObject(NodeId nodeid, const CInv& inv, std::chrono::microseconds current_time, bool fForce = false) = 0;
132130
virtual size_t GetRequestedObjectCount(NodeId nodeid) const = 0;
133131
};
134132

0 commit comments

Comments
 (0)