Skip to content

Conversation

dergoegge
Copy link
Member

This PR splits of the first couple commits from #25268 that move the inbound eviction logic from net.{h,cpp} to eviction.{h,cpp}.

Please look at #25268 for motivation and conceptual review.

@fanquake fanquake added the P2P label Jun 29, 2022
@dergoegge dergoegge force-pushed the 2022-06-evictionman-1ofN branch from 1ccde4c to 651c43f Compare June 29, 2022 12:30
@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 29, 2022

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #25493 (compat: document code in compat.h by fanquake)
  • #25472 (build: Increase MS Visual Studio minimum version by hebasto)
  • #25268 (refactor: Introduce EvictionManager by dergoegge)
  • #24170 (p2p, rpc: Manual block-relay-only connections with addnode by mzumsande)
  • #17167 (Allow whitelisting outgoing connections by luke-jr)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK

@dergoegge dergoegge force-pushed the 2022-06-evictionman-1ofN branch 2 times, most recently from 4f04786 to 2eb7256 Compare July 4, 2022 13:42
Copy link
Contributor

@jnewbery jnewbery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 2eb7256

@theuni
Copy link
Member

theuni commented Jul 6, 2022

utACK 2eb7256 modulo @jnewbery's nits. Regardless of the larger effort, I think this stands on its own as a nice cleanup and small fuzzing improvement.

@dergoegge dergoegge force-pushed the 2022-06-evictionman-1ofN branch from 2eb7256 to 0101d2b Compare July 6, 2022 16:16
@jnewbery
Copy link
Contributor

jnewbery commented Jul 6, 2022

utACK 0101d2b

@theuni
Copy link
Member

theuni commented Jul 7, 2022

utACK 0101d2b. I quickly verified with git --color-moved that the move-only changes are indeed move-only.

@fanquake fanquake merged commit d571cf2 into bitcoin:master Jul 7, 2022
@@ -9,6 +9,7 @@
#include <chainparams.h>
#include <common/bloom.h>
#include <compat.h>
#include <node/connection_types.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Just noticed these are now out of the recommended include order

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 13, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Jul 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants