foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-14 11:26:09 -05:00
Code Issues Activity

Merge bitcoin/bitcoin#31338: test: Deduplicate assert_mempool_contents()

Browse source 
a0eafc10f9 functional test: Deduplicate assert_mempool_contents() (Hodlinator)

Pull request description:

  Recently added `mempool_util` implementation probably evolved in parallel with the package RBF one before being submitted as part of ephemeral dust in e2e30e89ba (related comments: https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1825278134, https://github.com/bitcoin/bitcoin/pull/31279#pullrequestreview-2445579323).

ACKs for top commit:
  instagibbs:
    ACK a0eafc10f9
  achow101:
    ACK a0eafc10f9
  l0rinc:
    ACK a0eafc10f9
  theStack:
    ACK a0eafc10f9

Tree-SHA512: 25ea807d7c041c18be0e4f424131419365d7c1e0fc6c4fb7ac7289c2f8196fd341ff2a2a3ea88df2c3a389edb4571a5fb889efc1b0204c65f7e09ef8f608d0d3
This commit is contained in:
Ava Chow 2024-11-21 19:11:27 -05:00
commit 2638fdb4f9
No known key found for this signature in database
GPG key ID: 17565732E08E5E41
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/functional/mempool_package_rbf.py
View file

@ -19,6 +19,7 @@ from test_framework.wallet import (
DEFAULT_FEE, DEFAULT_FEE,
MiniWallet, MiniWallet,
) )
from test_framework import mempool_util
MAX_REPLACEMENT_CANDIDATES = 100 MAX_REPLACEMENT_CANDIDATES = 100
@ -37,15 +38,7 @@ class PackageRBFTest(BitcoinTestFramework):
]] * self.num_nodes ]] * self.num_nodes
def assert_mempool_contents(self, expected=None): def assert_mempool_contents(self, expected=None):
"""Assert that all transactions in expected are in the mempool, mempool_util.assert_mempool_contents(self, self.nodes[0], expected, sync=False)
and no additional ones exist.
"""
if not expected:
expected = []
mempool = self.nodes[0].getrawmempool(verbose=False)
assert_equal(len(mempool), len(expected))
for tx in expected:
assert tx.rehash() in mempool
def create_simple_package(self, parent_coin, parent_fee=DEFAULT_FEE, child_fee=DEFAULT_CHILD_FEE, heavy_child=False): def create_simple_package(self, parent_coin, parent_fee=DEFAULT_FEE, child_fee=DEFAULT_CHILD_FEE, heavy_child=False):
"""Create a 1 parent 1 child package using the coin passed in as the parent's input. The """Create a 1 parent 1 child package using the coin passed in as the parent's input. The