@@ -646,7 +646,7 @@ static void UpdatePreferredDownload(const CNode& node, CNodeState* state) EXCLUS
646
646
nPreferredDownload += state->fPreferredDownload ;
647
647
}
648
648
649
- bool PeerManagerImpl::MarkBlockAsReceived (const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
649
+ bool PeerManagerImpl::MarkBlockAsReceived (const uint256& hash)
650
650
{
651
651
std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find (hash);
652
652
if (itInFlight != mapBlocksInFlight.end ()) {
@@ -670,7 +670,7 @@ bool PeerManagerImpl::MarkBlockAsReceived(const uint256& hash) EXCLUSIVE_LOCKS_R
670
670
return false ;
671
671
}
672
672
673
- bool PeerManagerImpl::MarkBlockAsInFlight (NodeId nodeid, const uint256& hash, const CBlockIndex* pindex, std::list<QueuedBlock>::iterator** pit) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
673
+ bool PeerManagerImpl::MarkBlockAsInFlight (NodeId nodeid, const uint256& hash, const CBlockIndex* pindex, std::list<QueuedBlock>::iterator** pit)
674
674
{
675
675
CNodeState *state = State (nodeid);
676
676
assert (state != nullptr );
@@ -739,7 +739,7 @@ static void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) EXCLUSIV
739
739
}
740
740
}
741
741
742
- void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs (NodeId nodeid) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
742
+ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs (NodeId nodeid)
743
743
{
744
744
AssertLockHeld (cs_main);
745
745
CNodeState* nodestate = State (nodeid);
@@ -778,7 +778,7 @@ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid) EXCLUS
778
778
}
779
779
}
780
780
781
- bool PeerManagerImpl::TipMayBeStale () EXCLUSIVE_LOCKS_REQUIRED(cs_main)
781
+ bool PeerManagerImpl::TipMayBeStale ()
782
782
{
783
783
AssertLockHeld (cs_main);
784
784
const Consensus::Params& consensusParams = m_chainparams.GetConsensus ();
@@ -802,7 +802,7 @@ static bool PeerHasHeader(CNodeState *state, const CBlockIndex *pindex) EXCLUSIV
802
802
return false ;
803
803
}
804
804
805
- void PeerManagerImpl::FindNextBlocksToDownload (NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
805
+ void PeerManagerImpl::FindNextBlocksToDownload (NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller)
806
806
{
807
807
if (count == 0 )
808
808
return ;
@@ -1591,7 +1591,7 @@ void PeerManagerImpl::BlockChecked(const CBlock& block, const BlockValidationSta
1591
1591
//
1592
1592
1593
1593
1594
- bool PeerManagerImpl::AlreadyHaveTx (const GenTxid& gtxid) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
1594
+ bool PeerManagerImpl::AlreadyHaveTx (const GenTxid& gtxid)
1595
1595
{
1596
1596
assert (recentRejects);
1597
1597
if (::ChainActive ().Tip ()->GetBlockHash () != hashRecentRejectsChainTip) {
@@ -1853,7 +1853,7 @@ void static ProcessGetBlockData(CNode& pfrom, Peer& peer, const CChainParams& ch
1853
1853
}
1854
1854
}
1855
1855
1856
- CTransactionRef PeerManagerImpl::FindTxForGetData (const CNode& peer, const GenTxid& gtxid, const std::chrono::seconds mempool_req, const std::chrono::seconds now) LOCKS_EXCLUDED(cs_main)
1856
+ CTransactionRef PeerManagerImpl::FindTxForGetData (const CNode& peer, const GenTxid& gtxid, const std::chrono::seconds mempool_req, const std::chrono::seconds now)
1857
1857
{
1858
1858
auto txinfo = m_mempool.info (gtxid);
1859
1859
if (txinfo.tx ) {
@@ -1880,7 +1880,7 @@ CTransactionRef PeerManagerImpl::FindTxForGetData(const CNode& peer, const GenTx
1880
1880
return {};
1881
1881
}
1882
1882
1883
- void PeerManagerImpl::ProcessGetData (CNode& pfrom, Peer& peer, const std::atomic<bool >& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(!cs_main, peer.m_getdata_requests_mutex)
1883
+ void PeerManagerImpl::ProcessGetData (CNode& pfrom, Peer& peer, const std::atomic<bool >& interruptMsgProc)
1884
1884
{
1885
1885
AssertLockNotHeld (cs_main);
1886
1886
0 commit comments