Skip to content

Commit 257568e

Browse files
committed
[refactor] move invalid package processing to TxDownload
1 parent c4ce0c1 commit 257568e

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

src/net_processing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3029,7 +3029,7 @@ void PeerManagerImpl::ProcessPackageResult(const node::PackageToValidate& packag
30293029
const auto& senders = package_to_validate.m_senders;
30303030

30313031
if (package_result.m_state.IsInvalid()) {
3032-
RecentRejectsReconsiderableFilter().insert(GetPackageHash(package));
3032+
m_txdownloadman.MempoolRejectedPackage(package);
30333033
}
30343034
// We currently only expect to process 1-parent-1-child packages. Remove if this changes.
30353035
if (!Assume(package.size() == 2)) return;

src/node/txdownloadman.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ class TxDownloadManager {
168168

169169
/** Respond to transaction rejected from mempool */
170170
RejectedTxTodo MempoolRejectedTx(const CTransactionRef& ptx, const TxValidationState& state, NodeId nodeid, bool first_time_failure);
171+
172+
/** Respond to package rejected from mempool */
173+
void MempoolRejectedPackage(const Package& package);
171174
};
172175
} // namespace node
173176
#endif // BITCOIN_NODE_TXDOWNLOADMAN_H

src/node/txdownloadman_impl.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ RejectedTxTodo TxDownloadManager::MempoolRejectedTx(const CTransactionRef& ptx,
7979
{
8080
return m_impl->MempoolRejectedTx(ptx, state, nodeid, first_time_failure);
8181
}
82+
void TxDownloadManager::MempoolRejectedPackage(const Package& package)
83+
{
84+
m_impl->MempoolRejectedPackage(package);
85+
}
8286

8387
// TxDownloadManagerImpl
8488
void TxDownloadManagerImpl::ActiveTipChange()
@@ -441,4 +445,9 @@ node::RejectedTxTodo TxDownloadManagerImpl::MempoolRejectedTx(const CTransaction
441445
.m_package_to_validate = std::move(package_to_validate)
442446
};
443447
}
448+
449+
void TxDownloadManagerImpl::MempoolRejectedPackage(const Package& package)
450+
{
451+
RecentRejectsReconsiderableFilter().insert(GetPackageHash(package));
452+
}
444453
} // namespace node

src/node/txdownloadman_impl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ class TxDownloadManagerImpl {
166166

167167
void MempoolAcceptedTx(const CTransactionRef& tx);
168168
RejectedTxTodo MempoolRejectedTx(const CTransactionRef& ptx, const TxValidationState& state, NodeId nodeid, bool first_time_failure);
169+
void MempoolRejectedPackage(const Package& package);
169170
};
170171
} // namespace node
171172
#endif // BITCOIN_NODE_TXDOWNLOADMAN_IMPL_H

0 commit comments

Comments
 (0)