diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-06-21 13:19:58 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-06-21 13:21:00 -0400 |
| commit | 8ef15e8a86038225afef2487ca23abc10ca5dffa (patch) | |
| tree | 66770a64b97ee0b9eaeba5562b9f6f033218b30f /src | |
| parent | 4b5c9191e3edf6d3c2ac52f95c91e30e357906c6 (diff) | |
| parent | fac63eb5eabcbbc2e51d414b9cf76f0e897dba1a (diff) | |
| download | bitcoin-8ef15e8a86038225afef2487ca23abc10ca5dffa.tar.xz | |
Merge #19198: test: Check that peers with forcerelay permission are not asked to feefilter
fac63eb5eabcbbc2e51d414b9cf76f0e897dba1a doc: Remove -whitelistforcerelay from comment (MarcoFalke)
faabd1514fecd828451387b025c1cc74a37bc854 test: Check that peers with forcerelay permission do not get a feefilter message (MarcoFalke)
fad676b8d2dfc3a8a62db3d3395d36d3e3076a5b test: Add connect_nodes method (MarcoFalke)
fac6ef4fb2bbe6187a52d716eab734d0b1e9a221 test: Add test for no net permission (MarcoFalke)
ffff3fe50a16bd7dde3d2d206bbe7bc41c483bb8 test: Replace self.nodes[0].p2p with conn (MarcoFalke)
faccdc8a3143c9849e61312a7f438bc6e8232496 test: remove redundant generate (MarcoFalke)
fab83b934abcd1228ff21afdc9f8b30ad09745fa test: pep-8 p2p_feefilter.py (MarcoFalke)
Pull request description:
ACKs for top commit:
jonatack:
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.
Tree-SHA512: 30a1c83baee15a4236d127d199c4f264852045372918d5aa5c09ef3d48041762ce3920ff86ef2466d4b2c792ddf56943d12b16c6dce34c6c5aea2a4af2eb4d49
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_processing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index d7fbf6941d..270e415e42 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -4387,9 +4387,9 @@ bool PeerLogicValidation::SendMessages(CNode* pto) // // Message: feefilter // - // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay if (pto->m_tx_relay != nullptr && pto->nVersion >= FEEFILTER_VERSION && gArgs.GetBoolArg("-feefilter", DEFAULT_FEEFILTER) && - !pto->HasPermission(PF_FORCERELAY)) { + !pto->HasPermission(PF_FORCERELAY) // peers with the forcerelay permission should not filter txs to us + ) { CAmount currentFilter = m_mempool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); int64_t timeNow = GetTimeMicros(); if (timeNow > pto->m_tx_relay->nextSendTimeFeeFilter) { |