Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#31338: test: Deduplicate assert_mempool_contents()
Browse files Browse the repository at this point in the history
a0eafc1 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 e2e30e8 (related comments: bitcoin/bitcoin#30239 (comment), bitcoin/bitcoin#31279 (review)).

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

Tree-SHA512: 25ea807d7c041c18be0e4f424131419365d7c1e0fc6c4fb7ac7289c2f8196fd341ff2a2a3ea88df2c3a389edb4571a5fb889efc1b0204c65f7e09ef8f608d0d3
  • Loading branch information
achow101 committed Nov 22, 2024
2 parents 17834bd + a0eafc1 commit 2638fdb
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions test/functional/mempool_package_rbf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
DEFAULT_FEE,
MiniWallet,
)
from test_framework import mempool_util

MAX_REPLACEMENT_CANDIDATES = 100

Expand All @@ -37,15 +38,7 @@ def set_test_params(self):
]] * self.num_nodes

def assert_mempool_contents(self, expected=None):
"""Assert that all transactions in expected are in the mempool,
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
mempool_util.assert_mempool_contents(self, self.nodes[0], expected, sync=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
Expand Down

0 comments on commit 2638fdb

Please sign in to comment.