From a0eafc10f94362408f54195ffd5a9237dc1ef638 Mon Sep 17 00:00:00 2001 From: Hodlinator <172445034+hodlinator@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:54:22 +0100 Subject: [PATCH] functional test: Deduplicate assert_mempool_contents() Recently added mempool_util implementation probably evolved in parallel with the package RBF one before being submitted as part of ephemeral dust in e2e30e89ba4b9bdbcabaf5b4346610922f0728bb. --- test/functional/mempool_package_rbf.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/functional/mempool_package_rbf.py b/test/functional/mempool_package_rbf.py index af1ff0f9a5d59..7c0947a33d2a9 100755 --- a/test/functional/mempool_package_rbf.py +++ b/test/functional/mempool_package_rbf.py @@ -19,6 +19,7 @@ DEFAULT_FEE, MiniWallet, ) +from test_framework import mempool_util MAX_REPLACEMENT_CANDIDATES = 100 @@ -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