test: Check that peers with forcerelay permission are not asked to feefilter #19198
pull MarcoFalke wants to merge 7 commits into bitcoin:master from MarcoFalke:2006-testForcerelayFeefilter changing 4 files +63 −22-
MarcoFalke commented at 1:43 pm on June 7, 2020: member
-
MarcoFalke added the label Tests on Jun 7, 2020
-
in test/functional/p2p_feefilter.py:15 in fa473a0448 outdated
8@@ -9,12 +9,16 @@ 9 10 from test_framework.messages import MSG_TX, msg_feefilter 11 from test_framework.mininode import mininode_lock, P2PInterface 12-from test_framework.test_framework import BitcoinTestFramework 13+from test_framework.test_framework import ( 14+ BitcoinTestFramework, 15+ assert_equal, 16+)
jonatack commented at 3:45 pm on June 7, 2020:This runs, but ISTM no other tests import this way and instead do:
0from test_framework.test_framework import BitcoinTestFramework 1from test_framework.util import assert_equal
MarcoFalke commented at 4:44 pm on June 7, 2020:Whoopsie. Fixed!jonatack commented at 3:56 pm on June 7, 2020: memberACK fa473a0448817004a6271fbee926eb4a2a4258a4 modulo unusual test importMarcoFalke force-pushed on Jun 7, 2020jonatack commented at 4:51 pm on June 7, 2020: memberACK faccf0a3b6f1DrahtBot commented at 11:36 pm on June 7, 2020: memberThe following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #19208 (test: move sync_blocks and sync_mempool functions to test_framework.py by ycshao)
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 added the label Needs rebase on Jun 8, 2020MarcoFalke force-pushed on Jun 8, 2020MarcoFalke force-pushed on Jun 8, 2020DrahtBot removed the label Needs rebase on Jun 8, 2020MarcoFalke force-pushed on Jun 9, 2020vahidjalaliii approvedfanquake deleted a comment on Jun 9, 2020MarcoFalke force-pushed on Jun 21, 2020MarcoFalke commented at 1:29 pm on June 21, 2020: memberForce pushed a move-only to avoid a merge conflict (no rebase done). Should be trivial to re-ACKjonatack commented at 3:14 pm on June 21, 2020: memberCode review re-ACK faaac4e move-only change of two class member functions in test_framework.py since my last review pergit range-diff 4b5c919 faccf0a faaac4e
, idem since rebase pergit diff fa39586 faaac4e
. Edit: verified p2p_feefilter and p2p_permissions functional tests run green locally.test: pep-8 p2p_feefilter.py fab83b934atest: remove redundant generate
setup_nodes takes care of getting out of ibd
test: Replace self.nodes[0].p2p with conn ffff3fe50atest: Add test for no net permission fac6ef4fb2test: Add connect_nodes method fad676b8d2test: Check that peers with forcerelay permission do not get a feefilter message faabd1514fdoc: Remove -whitelistforcerelay from comment
Instead, permission flags should be used. For example -whitelist=forcerelay@127.0.0.1
MarcoFalke force-pushed on Jun 21, 2020MarcoFalke commented at 4:19 pm on June 21, 2020: memberSorry, I had to rebase due to a silent merge conflict, now thatmininode_lock
is no longer a recursive lock.jonatack commented at 5:09 pm on June 21, 2020: memberre-ACK fac63eb move-only change of two class member functions in test_framework.py and rebases since my review @ faccf0a pergit range-diff 4b5c919 faccf0a fac63eb
. Verified p2p_feefilter and p2p_permissions functional tests are running :green_circle: locally.MarcoFalke merged this on Jun 21, 2020MarcoFalke closed this on Jun 21, 2020
MarcoFalke deleted the branch on Jun 21, 2020Fabcien referenced this in commit ac3faaf599 on May 18, 2021DrahtBot locked this on Feb 15, 2022
MarcoFalke jonatack DrahtBot vahidjalaliiiLabels
Tests
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-23 12:12 UTC
More mirrored repositories can be found on mirror.b10c.me