diff options
| author | Pieter Wuille <[email protected]> | 2020-06-01 10:53:03 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2020-07-08 18:28:00 -0700 |
| commit | a9bc5638031a29abaa40284273a3507b345c31e9 (patch) | |
| tree | a4ab9d0f6b3a5d17d6b104954ae212f65170e1d8 /src/net_processing.cpp | |
| parent | Merge #19347: [net] Make cs_inventory nonrecursive (diff) | |
| download | discoin-a9bc5638031a29abaa40284273a3507b345c31e9.tar.xz discoin-a9bc5638031a29abaa40284273a3507b345c31e9.zip | |
Swap relay pool and mempool lookup
This is in preparation to using the mempool entering time as part of
the decision for relay, but does not change behavior on itself.
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index f1a89a893..07c12938c 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1627,13 +1627,6 @@ CTransactionRef static FindTxForGetData(CNode& peer, const uint256& txid, const if (peer.m_tx_relay->setInventoryTxToSend.count(txid)) return {}; } - { - LOCK(cs_main); - // Look up transaction in relay pool - auto mi = mapRelay.find(txid); - if (mi != mapRelay.end()) return mi->second; - } - auto txinfo = mempool.info(txid); if (txinfo.tx) { // To protect privacy, do not answer getdata using the mempool when @@ -1644,6 +1637,13 @@ CTransactionRef static FindTxForGetData(CNode& peer, const uint256& txid, const } } + { + LOCK(cs_main); + // Look up transaction in relay pool + auto mi = mapRelay.find(txid); + if (mi != mapRelay.end()) return mi->second; + } + return {}; } |