Clean up separated ban/discourage interface
ClosedPublic
Actions

Authored by jasonbcox on Aug 7 2020, 00:13.

Details

Reviewers

deadalnix

Group Reviewers

Restricted Project

Commits

rABC3c30539ab667: Clean up separated ban/discourage interface

Summary

This completes the backport of Core PR19219, the last commit being delayed due to missing
dependant backports.

https://github.com/bitcoin/bitcoin/pull/19219/commits/2ad58381fffb33d611abf900b73d9e6b5a4e35f8

Test Plan

ninja check check-functional

cmake -GNinja .. -DENABLE_SANITIZERS="address;fuzzer" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
ninja bitcoin-fuzzers
./src/test/fuzz/addrdb

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jasonbcox created this revision.Aug 7 2020, 00:13

Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 7 2020, 00:13

jasonbcox requested review of this revision.Aug 7 2020, 00:13

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

jasonbcox added inline comments.Aug 7 2020, 00:17

src/net_processing.cpp
3964 ↗	(On Diff #22789)	We're missing a backport here that prevents me from including the rename `CheckIfBanned` -> `MaybeDiscourageAndDisconnect` but I don't think it's consequential enough to hold this change back. We'll catch up to the name change eventually.
src/test/fuzz/addrdb.cpp
19 ↗	(On Diff #22789)	This is my removal for two reasons: It's unused now. It's being shadowed within the lambda.