Skip to content

Commit

Permalink
scripted-diff: rename TxOrphanage::EraseTxNoLock to EraseTxInternal
Browse files Browse the repository at this point in the history
The lock doesn't exist anymore.

-BEGIN VERIFY SCRIPT-
sed -i 's/EraseTxNoLock/EraseTxInternal/g' src/txorphanage.*
-END VERIFY SCRIPT-))'
  • Loading branch information
glozow committed May 20, 2024
1 parent 879f5db commit 7c3fb97
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/txorphanage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ bool TxOrphanage::AddTx(const CTransactionRef& tx, NodeId peer)

int TxOrphanage::EraseTx(const Wtxid& wtxid)
{
return EraseTxNoLock(wtxid);
return EraseTxInternal(wtxid);
}

int TxOrphanage::EraseTxNoLock(const Wtxid& wtxid)
int TxOrphanage::EraseTxInternal(const Wtxid& wtxid)
{
std::map<Wtxid, OrphanTx>::iterator it = m_orphans.find(wtxid);
if (it == m_orphans.end())
Expand Down Expand Up @@ -101,7 +101,7 @@ void TxOrphanage::EraseForPeer(NodeId peer)
// increment to avoid iterator becoming invalid after erasure
const auto& [wtxid, orphan] = *iter++;
if (orphan.fromPeer == peer) {
nErased += EraseTxNoLock(wtxid);
nErased += EraseTxInternal(wtxid);
}
}
if (nErased > 0) LogPrint(BCLog::TXPACKAGES, "Erased %d orphan transaction(s) from peer=%d\n", nErased, peer);
Expand All @@ -121,7 +121,7 @@ void TxOrphanage::LimitOrphans(unsigned int max_orphans, FastRandomContext& rng)
{
std::map<Wtxid, OrphanTx>::iterator maybeErase = iter++;
if (maybeErase->second.nTimeExpire <= nNow) {
nErased += EraseTxNoLock(maybeErase->second.tx->GetWitnessHash());
nErased += EraseTxInternal(maybeErase->second.tx->GetWitnessHash());
} else {
nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
}
Expand All @@ -134,7 +134,7 @@ void TxOrphanage::LimitOrphans(unsigned int max_orphans, FastRandomContext& rng)
{
// Evict a random orphan:
size_t randompos = rng.randrange(m_orphan_list.size());
EraseTxNoLock(m_orphan_list[randompos]->second.tx->GetWitnessHash());
EraseTxInternal(m_orphan_list[randompos]->second.tx->GetWitnessHash());
++nEvicted;
}
if (nEvicted > 0) LogPrint(BCLog::TXPACKAGES, "orphanage overflow, removed %u tx\n", nEvicted);
Expand Down Expand Up @@ -213,7 +213,7 @@ void TxOrphanage::EraseForBlock(const CBlock& block)
if (vOrphanErase.size()) {
int nErased = 0;
for (const auto& orphanHash : vOrphanErase) {
nErased += EraseTxNoLock(orphanHash);
nErased += EraseTxInternal(orphanHash);
}
LogPrint(BCLog::TXPACKAGES, "Erased %d orphan transaction(s) included or conflicted by block\n", nErased);
}
Expand Down
2 changes: 1 addition & 1 deletion src/txorphanage.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class TxOrphanage {
std::vector<OrphanMap::iterator> m_orphan_list;

/** Erase an orphan by wtxid */
int EraseTxNoLock(const Wtxid& wtxid);
int EraseTxInternal(const Wtxid& wtxid);
};

#endif // BITCOIN_TXORPHANAGE_H

0 comments on commit 7c3fb97

Please sign in to comment.