Skip to content

Commit 4d23d1d

Browse files
committed
[cleanup] remove unused rng param from LimitOrphans
1 parent 067365d commit 4d23d1d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/node/txdownloadman_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ bool TxDownloadManagerImpl::AddTxAnnouncement(NodeId peer, const GenTxid& gtxid,
188188

189189
if (MaybeAddOrphanResolutionCandidate(unique_parents, *wtxid, peer, now)) {
190190
m_orphanage->AddAnnouncer(orphan_tx->GetWitnessHash(), peer);
191-
m_orphanage->LimitOrphans(m_opts.m_rng);
191+
m_orphanage->LimitOrphans();
192192
}
193193

194194
// Return even if the peer isn't an orphan resolution candidate. This would be caught by AlreadyHaveTx.
@@ -421,7 +421,7 @@ node::RejectedTxTodo TxDownloadManagerImpl::MempoolRejectedTx(const CTransaction
421421
m_txrequest.ForgetTxHash(tx.GetWitnessHash());
422422

423423
// DoS prevention: do not allow m_orphanage to grow unbounded (see CVE-2012-3789)
424-
m_orphanage->LimitOrphans(m_opts.m_rng);
424+
m_orphanage->LimitOrphans();
425425
} else {
426426
unique_parents.clear();
427427
LogDebug(BCLog::MEMPOOL, "not keeping orphan with rejected parents %s (wtxid=%s)\n",

src/node/txorphanage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class TxOrphanageImpl final : public TxOrphanage {
216216
bool EraseTx(const Wtxid& wtxid) override;
217217
void EraseForPeer(NodeId peer) override;
218218
void EraseForBlock(const CBlock& block) override;
219-
void LimitOrphans(FastRandomContext& rng) override;
219+
void LimitOrphans() override;
220220
void AddChildrenToWorkSet(const CTransaction& tx, FastRandomContext& rng) override;
221221
bool HaveTxToReconsider(NodeId peer) override;
222222
std::vector<CTransactionRef> GetChildrenFromSamePeer(const CTransactionRef& parent, NodeId nodeid) const override;
@@ -408,7 +408,7 @@ void TxOrphanageImpl::EraseForPeer(NodeId peer)
408408
* amount of announcements and space for each peer. The reserved amount is protected from eviction even if there
409409
* are peers spamming the orphanage.
410410
*/
411-
void TxOrphanageImpl::LimitOrphans(FastRandomContext& rng)
411+
void TxOrphanageImpl::LimitOrphans()
412412
{
413413
if (!NeedsTrim()) return;
414414

src/node/txorphanage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class TxOrphanage {
9191
virtual void EraseForBlock(const CBlock& block) = 0;
9292

9393
/** Limit the orphanage to MaxGlobalLatencyScore and MaxGlobalUsage. */
94-
virtual void LimitOrphans(FastRandomContext& rng) = 0;
94+
virtual void LimitOrphans() = 0;
9595

9696
/** Add any orphans that list a particular tx as a parent into the from peer's work set */
9797
virtual void AddChildrenToWorkSet(const CTransaction& tx, FastRandomContext& rng) = 0;

src/test/fuzz/txorphan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
217217
[&] {
218218
// test mocktime and expiry
219219
SetMockTime(ConsumeTime(fuzzed_data_provider));
220-
orphanage->LimitOrphans(orphanage_rng);
220+
orphanage->LimitOrphans();
221221
Assert(orphanage->Size() <= node::DEFAULT_MAX_ORPHAN_TRANSACTIONS);
222222
});
223223

0 commit comments

Comments
 (0)