net_processing: move FindTxForGetData and ProcessGetData to PeerManagerImpl
ClosedPublic
Actions

Authored by PiRK on May 6 2022, 15:55.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCbc00297c37d9: net_processing: move FindTxForGetData and ProcessGetData to PeerManagerImpl

Summary

Allows making mapRelay and vRelayExpiration members rather than globals.
Remove need to pass mempool of conman to methods?

This is a backport of core#20942 [6&7/9]
https://github.com/bitcoin/bitcoin/pull/20942/commits/34207b9004d2069a8fcb32758cd796143eccfb4d
https://github.com/bitcoin/bitcoin/pull/20942/commits/7b7117efd00acf7609e65d3b4fe5f76e400dda12

Depends on D11435

Notes :

also convert a uint256 to TxId in mapRelay type
rename g_relay_expiration to vRelayExpiration now that it is no longer a global (undoes a change in D10914). The m_ prefix is not very commonly used in this class, so I feel like it is best to stick with the source material.

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.May 6 2022, 15:55

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 6 2022, 15:55

PiRK requested review of this revision.May 6 2022, 15:55

teamcity edited the summary of this revision. (Show Details)May 6 2022, 15:55

PiRK edited the summary of this revision. (Show Details)May 6 2022, 16:04

PiRK added a child revision: D11437: net_processing: move MaybeSetPeerAsAnnouncingHeadersAndIDs into PeerManagerImpl.May 6 2022, 16:04

Harbormaster completed remote builds in B18977: Diff 33441.May 6 2022, 16:26

Fabien requested changes to this revision.May 9 2022, 10:02

Fabien added a subscriber: Fabien.

Fabien added inline comments.

src/net_processing.cpp
814 ↗	(On Diff #33441)	The renaming to g_relay_expiration happened after this PR, you should keep that name
2635 ↗	(On Diff #33441)	You removed the annotation

This revision now requires changes to proceed.May 9 2022, 10:02

PiRK edited the summary of this revision. (Show Details)May 9 2022, 14:27

Restore g_relay_expiration var name (I assumed that we intentionnaly diverged from Core, but it is actually an out of order backport from core#21015)
Add lock annotation to FindTxForGetData method declaration

Harbormaster completed remote builds in B18982: Diff 33451.May 9 2022, 14:44

Fabien accepted this revision.May 10 2022, 10:01

This revision is now accepted and ready to land.May 10 2022, 10:01

Closed by commit rABCbc00297c37d9: net_processing: move FindTxForGetData and ProcessGetData to PeerManagerImpl (authored by PiRK). · Explain WhyMay 10 2022, 15:13

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABCbc00297c37d9: net_processing: move FindTxForGetData and ProcessGetData to PeerManagerImpl.

Fabien mentioned this in D11442: Fix thread safety error: negative handling capability.May 11 2022, 08:46

Fabien mentioned this in rABCd63cbfbcbd5b: Fix thread safety error: negative handling capability.May 11 2022, 11:02