Skip to content

test: Check that peers with forcerelay permission are not asked to feefilter#19198

Merged
maflcko merged 7 commits intobitcoin:masterfrom
maflcko:2006-testForcerelayFeefilter
Jun 21, 2020
Merged

test: Check that peers with forcerelay permission are not asked to feefilter#19198
maflcko merged 7 commits intobitcoin:masterfrom
maflcko:2006-testForcerelayFeefilter

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Jun 7, 2020

No description provided.

@maflcko maflcko added the Tests label Jun 7, 2020
jonatack
jonatack reviewed Jun 7, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

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

ACK fa473a0448817004a6271fbee926eb4a2a4258a4 modulo unusual test import

@maflcko maflcko force-pushed the 2006-testForcerelayFeefilter branch from fa473a0 to faccf0a Compare June 7, 2020 16:42
@jonatack
Copy link
Member

jonatack commented Jun 7, 2020

ACK faccf0a3b6f1

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 7, 2020 •
edited
Loading

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.

@DrahtBot DrahtBot mentioned this pull request Jun 8, 2020
Merged
@maflcko maflcko force-pushed the 2006-testForcerelayFeefilter branch 2 times, most recently from fac6ab1 to fa8274d Compare June 8, 2020 17:15
@DrahtBot DrahtBot mentioned this pull request Jun 9, 2020
Merged
@maflcko maflcko force-pushed the 2006-testForcerelayFeefilter branch from fa8274d to fa39586 Compare June 9, 2020 00:56
@bitcoin bitcoin deleted a comment from vahidjalaliii Jun 9, 2020
@DrahtBot DrahtBot mentioned this pull request Jun 17, 2020
Closed
@maflcko maflcko force-pushed the 2006-testForcerelayFeefilter branch from fa39586 to faaac4e Compare June 21, 2020 13:28
@maflcko
Copy link
Member Author

maflcko commented Jun 21, 2020

Force pushed a move-only to avoid a merge conflict (no rebase done). Should be trivial to re-ACK

jonatack
jonatack reviewed Jun 21, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Code review re-ACK faaac4e move-only change of two class member functions in test_framework.py since my last review per git range-diff 4b5c919 faccf0a faaac4e, idem since rebase per git diff fa39586 faaac4e. Edit: verified p2p_feefilter and p2p_permissions functional tests run green locally.

@maflcko maflcko force-pushed the 2006-testForcerelayFeefilter branch from faaac4e to fac63eb Compare June 21, 2020 16:18
@maflcko
Copy link
Member Author

maflcko commented Jun 21, 2020

Sorry, I had to rebase due to a silent merge conflict, now that mininode_lock is no longer a recursive lock.

@jonatack
Copy link
Member

jonatack commented Jun 21, 2020

re-ACK fac63eb move-only change of two class member functions in test_framework.py and rebases since my review @ faccf0a per git range-diff 4b5c919 faccf0a fac63eb. Verified p2p_feefilter and p2p_permissions functional tests are running 🟢 locally.

@maflcko maflcko merged commit 8ef15e8 into bitcoin:master Jun 21, 2020
@maflcko maflcko deleted the 2006-testForcerelayFeefilter branch June 21, 2020 17:25
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request May 18, 2021
@Fabcien
test: Check that peers with forcerelay permission are not asked to fe…
ac3faaf 
…efilter

Summary:
Backport of [[bitcoin/bitcoin#19198 | core#19198]].

The signature of util.connect_nodes in our codebase differs from core,
so this has been adapted accordingly.

Test Plan:
  ninja check-extended

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Differential Revision: https://reviews.bitcoinabc.org/D9546
@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

2 more reviewers

@jonatack jonatack jonatack left review comments

@vahidjalaliii vahidjalaliii vahidjalaliii approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@maflcko @jonatack @DrahtBot @vahidjalaliii