mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
test: Add missing sync_mempools() to fill_mempool()
Also disable the function, when it is not needed.
This commit is contained in:
parent
fa48be6f02
commit
faf801515f
4 changed files with 11 additions and 13 deletions
|
@ -554,7 +554,7 @@ class PackageRBFTest(BitcoinTestFramework):
|
|||
self.generate(node, 1)
|
||||
|
||||
def test_child_conflicts_parent_mempool_ancestor(self):
|
||||
fill_mempool(self, self.nodes[0])
|
||||
fill_mempool(self, self.nodes[0], tx_sync_fun=self.no_op)
|
||||
# Reset coins since we filled the mempool with current coins
|
||||
self.coins = self.wallet.get_utxos(mark_as_spent=False, confirmed_only=True)
|
||||
|
||||
|
|
|
@ -49,9 +49,6 @@ class PackageRelayTest(BitcoinTestFramework):
|
|||
def raise_network_minfee(self):
|
||||
fill_mempool(self, self.nodes[0])
|
||||
|
||||
self.log.debug("Wait for the network to sync mempools")
|
||||
self.sync_mempools()
|
||||
|
||||
self.log.debug("Check that all nodes' mempool minimum feerates are above min relay feerate")
|
||||
for node in self.nodes:
|
||||
assert_equal(node.getmempoolinfo()['minrelaytxfee'], FEERATE_1SAT_VB)
|
||||
|
|
|
@ -250,7 +250,7 @@ class TxDownloadTest(BitcoinTestFramework):
|
|||
def test_rejects_filter_reset(self):
|
||||
self.log.info('Check that rejected tx is not requested again')
|
||||
node = self.nodes[0]
|
||||
fill_mempool(self, node)
|
||||
fill_mempool(self, node, tx_sync_fun=self.no_op)
|
||||
self.wallet.rescan_utxos()
|
||||
mempoolminfee = node.getmempoolinfo()['mempoolminfee']
|
||||
peer = node.add_p2p_connection(TestP2PConn())
|
||||
|
|
|
@ -19,14 +19,11 @@ from .wallet import (
|
|||
)
|
||||
|
||||
|
||||
def fill_mempool(test_framework, node):
|
||||
def fill_mempool(test_framework, node, *, tx_sync_fun=None):
|
||||
"""Fill mempool until eviction.
|
||||
|
||||
Allows for simpler testing of scenarios with floating mempoolminfee > minrelay
|
||||
Requires -datacarriersize=100000 and
|
||||
-maxmempool=5.
|
||||
It will not ensure mempools become synced as it
|
||||
is based on a single node and assumes -minrelaytxfee
|
||||
Requires -datacarriersize=100000 and -maxmempool=5 and assumes -minrelaytxfee
|
||||
is 1 sat/vbyte.
|
||||
To avoid unintentional tx dependencies, the mempool filling txs are created with a
|
||||
tagged ephemeral miniwallet instance.
|
||||
|
@ -69,9 +66,13 @@ def fill_mempool(test_framework, node):
|
|||
batch_fees = [(i + 1) * base_fee for i in range(num_of_batches)]
|
||||
|
||||
test_framework.log.debug("Fill up the mempool with txs with higher fee rate")
|
||||
with node.assert_debug_log(["rolling minimum fee bumped"]):
|
||||
for fee in batch_fees:
|
||||
send_batch(fee)
|
||||
for fee in batch_fees[:-3]:
|
||||
send_batch(fee)
|
||||
tx_sync_fun() if tx_sync_fun else test_framework.sync_mempools() # sync before any eviction
|
||||
assert_equal(node.getmempoolinfo()["mempoolminfee"], Decimal("0.00001000"))
|
||||
for fee in batch_fees[-3:]:
|
||||
send_batch(fee)
|
||||
tx_sync_fun() if tx_sync_fun else test_framework.sync_mempools() # sync after all evictions
|
||||
|
||||
test_framework.log.debug("The tx should be evicted by now")
|
||||
# The number of transactions created should be greater than the ones present in the mempool
|
||||
|
|
Loading…
Reference in a new issue