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

MarcoFalke commented at 1:43 PM on June 7, 2020: member

No description provided.

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:

from test_framework.test_framework import BitcoinTestFramework
from 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: contributor

ACK fa473a0448817004a6271fbee926eb4a2a4258a4 modulo unusual test import

MarcoFalke force-pushed on Jun 7, 2020

jonatack commented at 4:51 PM on June 7, 2020: contributor

ACK faccf0a3b6f1

DrahtBot commented at 11:36 PM on June 7, 2020: contributor

The 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 cross-referenced this on Jun 8, 2020 from issue test: disconnect_nodes should warn if nodes were already disconnected by robot-visions

DrahtBot added the label Needs rebase on Jun 8, 2020

MarcoFalke force-pushed on Jun 8, 2020

DrahtBot removed the label Needs rebase on Jun 8, 2020

DrahtBot cross-referenced this on Jun 9, 2020 from issue test: move sync_blocks and sync_mempool functions to test_framework.py by ycshao

MarcoFalke force-pushed on Jun 9, 2020

vahidjalaliii approved

bitcoin deleted a comment on Jun 9, 2020

DrahtBot cross-referenced this on Jun 17, 2020 from issue refactor: Replace RecursiveMutex with Mutex in CTxMemPool by hebasto

MarcoFalke force-pushed on Jun 21, 2020

MarcoFalke commented at 1:29 PM on June 21, 2020: member

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

jonatack commented at 3:14 PM on June 21, 2020: contributor

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.

test: pep-8 p2p_feefilter.py fab83b934a

test: remove redundant generate

setup_nodes takes care of getting out of ibd

faccdc8a31

test: Replace self.nodes[0].p2p with conn ffff3fe50a

test: Add test for no net permission fac6ef4fb2

test: Add connect_nodes method fad676b8d2

test: Check that peers with forcerelay permission do not get a feefilter message faabd1514f

doc: Remove -whitelistforcerelay from comment

Instead, permission flags should be used. For example
-whitelist=forcerelay@127.0.0.1

fac63eb5ea

MarcoFalke force-pushed on Jun 21, 2020

MarcoFalke commented at 4:19 PM on June 21, 2020: member

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

jonatack commented at 5:09 PM on June 21, 2020: contributor

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 :green_circle: locally.

MarcoFalke merged this on Jun 21, 2020

MarcoFalke closed this on Jun 21, 2020

MarcoFalke deleted the branch on Jun 21, 2020

Fabcien referenced this in commit ac3faaf599 on May 18, 2021

bitcoin locked this on Feb 15, 2022