sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: convert IsInvInFilter to accept a const Peer&, introduce const version of GetTxRelay

Browse Source
This commit is contained in:
pasta 2024-12-03 09:33:45 -06:00
parent 30fc76c397
commit bb5d70c8d6
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/net_processing.cpp
View File

@ -327,6 +327,11 @@ struct Peer {
LOCK(m_tx_relay_mutex); LOCK(m_tx_relay_mutex);
return m_can_tx_relay ? m_tx_relay.get() : nullptr; return m_can_tx_relay ? m_tx_relay.get() : nullptr;
}; };
const TxRelay* GetTxRelay() const LOCKS_EXCLUDED(m_tx_relay_mutex)
{
LOCK(m_tx_relay_mutex);
return m_can_tx_relay ? m_tx_relay.get() : nullptr;
};
/** A vector of addresses to send to the peer, limited to MAX_ADDR_TO_SEND. */ /** A vector of addresses to send to the peer, limited to MAX_ADDR_TO_SEND. */
std::vector<CAddress> m_addrs_to_send GUARDED_BY(NetEventsInterface::g_msgproc_mutex); std::vector<CAddress> m_addrs_to_send GUARDED_BY(NetEventsInterface::g_msgproc_mutex);
@ -398,7 +403,7 @@ struct Peer {
{} {}
private: private:
Mutex m_tx_relay_mutex; mutable Mutex m_tx_relay_mutex;
/** Transaction relay data. /** Transaction relay data.
* (Bitcoin) Transaction relay data. May be a nullptr. * (Bitcoin) Transaction relay data. May be a nullptr.
@ -637,7 +642,7 @@ private:
/** /**
* Private implementation of IsInvInFilter which does not call GetPeerRef; to be prefered when the PeerRef is available. * Private implementation of IsInvInFilter which does not call GetPeerRef; to be prefered when the PeerRef is available.
*/ */
bool IsInvInFilter(const PeerRef& peer, const uint256& hash) const; bool IsInvInFilter(const Peer& peer, const uint256& hash) const;
/** Get a shared pointer to the Peer object. /** Get a shared pointer to the Peer object.
* May return an empty shared_ptr if the Peer object can't be found. */ * May return an empty shared_ptr if the Peer object can't be found. */
@ -2259,7 +2264,7 @@ void PeerManagerImpl::AskPeersForTransaction(const uint256& txid, bool is_master
if (peersToAsk.size() >= 4) { if (peersToAsk.size() >= 4) {
break; break;
} }
if (IsInvInFilter(peer, txid)) { if (IsInvInFilter(*peer, txid)) {
peersToAsk.emplace_back(peer); peersToAsk.emplace_back(peer);
} }
} }
@ -2280,14 +2285,14 @@ void PeerManagerImpl::AskPeersForTransaction(const uint256& txid, bool is_master
bool PeerManagerImpl::IsInvInFilter(NodeId nodeid, const uint256& hash) const bool PeerManagerImpl::IsInvInFilter(NodeId nodeid, const uint256& hash) const
{ {
PeerRef peer = GetPeerRef(nodeid); PeerRef peer = GetPeerRef(nodeid);
return IsInvInFilter(peer, hash);
}
bool PeerManagerImpl::IsInvInFilter(const PeerRef& peer, const uint256& hash) const
{
if (peer == nullptr) if (peer == nullptr)
return false; return false;
if (auto tx_relay = peer->GetTxRelay(); tx_relay != nullptr) { return IsInvInFilter(*peer, hash);
}
bool PeerManagerImpl::IsInvInFilter(const Peer& peer, const uint256& hash) const
{
if (auto tx_relay = peer.GetTxRelay(); tx_relay != nullptr) {
LOCK(tx_relay->m_tx_inventory_mutex); LOCK(tx_relay->m_tx_inventory_mutex);
return tx_relay->m_tx_inventory_known_filter.contains(hash); return tx_relay->m_tx_inventory_known_filter.contains(hash);
} }