Merge bloom_default-27

This commit is contained in:
Luke Dashjr 2024-08-01 00:06:00 +00:00
commit d67b05096f
2 changed files with 3 additions and 2 deletions

View File

@ -21,7 +21,7 @@ static const uint32_t DEFAULT_MAX_ORPHAN_TRANSACTIONS{100};
/** Default number of non-mempool transactions to keep around for block reconstruction. Includes
orphan, replaced, and rejected transactions. */
static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100};
static const bool DEFAULT_PEERBLOOMFILTERS = false;
static const bool DEFAULT_PEERBLOOMFILTERS = true;
static const bool DEFAULT_PEERBLOCKFILTERS = false;
/** Threshold for marking a node to be discouraged, e.g. disconnected and added to the discouragement filter. */
static const int DISCOURAGEMENT_THRESHOLD{100};

View File

@ -11,6 +11,7 @@ and that it responds to getdata requests for blocks correctly:
from test_framework.messages import (
CInv,
MSG_BLOCK,
NODE_BLOOM,
NODE_NETWORK_LIMITED,
NODE_P2P_V2,
NODE_WITNESS,
@ -57,7 +58,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
def run_test(self):
node = self.nodes[0].add_p2p_connection(P2PIgnoreInv())
expected_services = NODE_WITNESS | NODE_NETWORK_LIMITED
expected_services = NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED
if self.options.v2transport:
expected_services |= NODE_P2P_V2