Skip to content

p2p: banscore updates to gui, tests, release notes #19512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
laanwj merged 2 commits into from
Jul 15, 2020
Merged

p2p: banscore updates to gui, tests, release notes #19512

laanwj merged 2 commits into from
Jul 15, 2020

Conversation

@jonatack
Copy link
Member

@jonatack jonatack commented Jul 14, 2020 •
edited
Loading

This is the third -banscore PR in the mini-series described in #19464. See that PR for the intention and reasoning.

jonatack
jonatack commented Jul 14, 2020
View reviewed changes
@maflcko maflcko added the P2P label Jul 14, 2020
@maflcko maflcko added this to the 0.21.0 milestone Jul 14, 2020
@jonatack jonatack force-pushed the remove-banscore-from-gui branch from cbd77a1 to 38cc000 Compare July 14, 2020 08:20
@jonatack jonatack mentioned this pull request Jul 14, 2020
Merged
@jnewbery
Copy link
Contributor

jnewbery commented Jul 14, 2020

code review ACK 38cc0003812dbc7199bc00f5801f7ddb9ec89e37.

I think we should also remove -bantime, DEFAULT_MISBEHAVING_BANTIME, m_default_ban_time and the default time argument to Banman::Ban() now as well. Since Ban() can now only be called from the RPC or GUI, the user can provide a bantime on each call (with a default provided by RPC/GUI).

@jonatack jonatack force-pushed the remove-banscore-from-gui branch from 38cc000 to fa108d6 Compare July 14, 2020 12:16
@jonatack
Copy link
Member Author

jonatack commented Jul 14, 2020

Thanks for reviewing @jnewbery. Updated the second commit to follow up on your suggestion at #19464 (comment).

git diff 38cc000 fa108d6

@jonatack
Copy link
Member Author

jonatack commented Jul 14, 2020

I think we should also remove -bantime, DEFAULT_MISBEHAVING_BANTIME, m_default_ban_time and the default time argument to Banman::Ban() now as well. Since Ban() can now only be called from the RPC or GUI, the user can provide a bantime on each call (with a default provided by RPC/GUI).

You know how I love removing code. Will have a look for a follow-up.

@jnewbery
Copy link
Contributor

jnewbery commented Jul 14, 2020

ACK fa108d6

@jonatack jonatack changed the title gui, doc, test: banscore updates to gui, release notes, p2p_leak test p2p: banscore updates to gui, tests, release notes Jul 14, 2020
@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 14, 2020

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

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.

This was referenced Jul 14, 2020
Closed
Merged
Closed
@laanwj
Copy link
Member

laanwj commented Jul 15, 2020

ACK fa108d6
Did code review and tested the GUI change.

@laanwj laanwj merged commit 21209c9 into bitcoin:master Jul 15, 2020
@jonatack jonatack deleted the remove-banscore-from-gui branch July 15, 2020 14:47
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 16, 2020
@laanwj
Merge bitcoin#19512: p2p: banscore updates to gui, tests, release notes
9de76c7 
fa108d6 test: update tests for peer discouragement (Jon Atack)
1a9f462 gui, doc: rm Ban Score in GUI Peers window/release notes updates (Jon Atack)

Pull request description:

  This is the third `-banscore` PR in the mini-series described in bitcoin#19464. See that PR for the intention and reasoning.

  - no longer display "Ban Score" in the GUI peers window and add a release note, plus release note fixups per bitcoin#19464 (review)
  - update tests (`src/test/denialofservice_tests.cpp` and `test/functional/p2p_leak.py`) from banning to discouragement and per bitcoin#19464 (comment)

ACKs for top commit:
  jnewbery:
    ACK fa108d6
  laanwj:
    ACK fa108d6

Tree-SHA512: 58a449b3f47b8cb5490b34e4442ee8675bfad1ce48af4e4fd5c67715b0c1a596fb8e731d42e576b4c3b64627f76e0a68cbb1da9ea9f588a5932fe119baf40d50
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 6, 2021
@laanwj @majcosta
[backport#19512] p2p: banscore updates to gui, tests, release notes
59fd163 
Summary:
fa108d6a757838225179a8df942cfb6d99c98c90 test: update tests for peer discouragement (Jon Atack)
1a9f462caa63fa16d7b4415312d2032a42b3fe0b gui, doc: rm Ban Score in GUI Peers window/release notes updates (Jon Atack)

Pull request description:

  This is the third `-banscore` PR in the mini-series described in #19464. See that PR for the intention and reasoning.

  - no longer display "Ban Score" in the GUI peers window and add a release note, plus release note fixups per bitcoin/bitcoin#19464 (review)
  - update tests (`src/test/denialofservice_tests.cpp` and `test/functional/p2p_leak.py`) from banning to discouragement and per bitcoin/bitcoin#19464 (comment)

---

Backport of Core [[bitcoin/bitcoin#19512 | PR19512]]

Depends on D8799

Test Plan:
  ninja all check check-functional

run bitcoin-qt on testnet mode, open Peers window, click a peer and see
that Banscore is no longer reported

Reviewers: #bitcoin_abc, PiRK, Fabien

Reviewed By: #bitcoin_abc, PiRK, Fabien

Subscribers: Fabien, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D8800
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

P2P

Projects

None yet

Milestone

0.21.0

Development

Successfully merging this pull request may close these issues.

5 participants

@jonatack @jnewbery @DrahtBot @laanwj @maflcko