diff options
author | Anthony Towns <aj@erisian.com.au> | 2022-11-22 01:39:32 +1000 |
---|---|---|
committer | Anthony Towns <aj@erisian.com.au> | 2023-01-25 18:13:42 +1000 |
commit | be2304676bedcd15debcdc694549fdd2b255ba62 (patch) | |
tree | db3646c6daeedeb178905e8527e1311fea2bb722 /src/net_processing.cpp | |
parent | a4fe09973aa82210b98dcb4e4e9f11ef59780f9b (diff) |
txorphange: Drop redundant originator arg from GetTxToReconsider
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r-- | src/net_processing.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 5001358c59..9b9ef40001 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2892,10 +2892,9 @@ bool PeerManagerImpl::ProcessOrphanTx(Peer& peer) AssertLockHeld(cs_main); CTransactionRef porphanTx = nullptr; - NodeId from_peer = -1; bool more = false; - while (CTransactionRef porphanTx = m_orphanage.GetTxToReconsider(peer.m_id, from_peer, more)) { + while (CTransactionRef porphanTx = m_orphanage.GetTxToReconsider(peer.m_id, more)) { const MempoolAcceptResult result = m_chainman.ProcessTransaction(porphanTx); const TxValidationState& state = result.m_state; const uint256& orphanHash = porphanTx->GetHash(); @@ -2913,10 +2912,10 @@ bool PeerManagerImpl::ProcessOrphanTx(Peer& peer) if (state.IsInvalid()) { LogPrint(BCLog::MEMPOOL, " invalid orphan tx %s from peer=%d. %s\n", orphanHash.ToString(), - from_peer, + peer.m_id, state.ToString()); // Maybe punish peer that gave us an invalid orphan tx - MaybePunishNodeForTx(from_peer, state); + MaybePunishNodeForTx(peer.m_id, state); } // Has inputs but not accepted to mempool // Probably non-standard or insufficient fee |