Skip to content

Commit

Permalink
Merge bitcoin#29948: test: add missing comparison of node1's mempool …
Browse files Browse the repository at this point in the history
…in MempoolPackagesTest

e912717 test: add missing comparison of node1's mempool in MempoolPackagesTest (umiumi)

Pull request description:

  bitcoin#29941 Recreated a pull request because there was a conflict. Trying to resolve the conflict but the old one automatically closed.

  Add missing comparison for TODO comments in `mempool_packages.py`

  Also, notice that the ancestor size limits and descendant size limits actually implemented in bitcoin#21800   ,  so I removed the todo for those two size limits.

ACKs for top commit:
  kevkevinpal:
    ACK [e912717](bitcoin@e912717)
  achow101:
    ACK e912717
  alfonsoromanz:
    Tested ACK e912717. The code looks good to me and the test execution is successful.
  rkrux:
    tACK [e912717](bitcoin@e912717)

Tree-SHA512: 8cb51746b0547369344c9ceef59599bfe9c91d424687af5e24dc6641f9e99fb433515d79c724e71fd3d5e02994f0cef623d3674367b8296b05c3c6fcdde282ef
  • Loading branch information
achow101 committed May 10, 2024
2 parents 98dd4e7 + e912717 commit 7066980
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions test/functional/mempool_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,13 @@ def run_test(self):
assert set(mempool1).issubset(set(mempool0))
for tx in chain[:CUSTOM_ANCESTOR_LIMIT]:
assert tx in mempool1
# TODO: more detailed check of node1's mempool (fees etc.)
# check transaction unbroadcast info (should be false if in both mempools)
mempool = self.nodes[0].getrawmempool(True)
for tx in mempool:
assert_equal(mempool[tx]['unbroadcast'], False)

# TODO: test ancestor size limits
entry0 = self.nodes[0].getmempoolentry(tx)
entry1 = self.nodes[1].getmempoolentry(tx)
assert not entry0['unbroadcast']
assert not entry1['unbroadcast']
assert_equal(entry1['fees']['base'], entry0['fees']['base'])
assert_equal(entry1['vsize'], entry0['vsize'])
assert_equal(entry1['depends'], entry0['depends'])

# Now test descendant chain limits

Expand Down Expand Up @@ -251,10 +251,14 @@ def run_test(self):
assert tx in mempool1
for tx in chain[CUSTOM_DESCENDANT_LIMIT:]:
assert tx not in mempool1
# TODO: more detailed check of node1's mempool (fees etc.)

# TODO: test descendant size limits

for tx in mempool1:
entry0 = self.nodes[0].getmempoolentry(tx)
entry1 = self.nodes[1].getmempoolentry(tx)
assert not entry0['unbroadcast']
assert not entry1['unbroadcast']
assert_equal(entry1['fees']['base'], entry0['fees']['base'])
assert_equal(entry1['vsize'], entry0['vsize'])
assert_equal(entry1['depends'], entry0['depends'])
# Test reorg handling
# First, the basics:
self.generate(self.nodes[0], 1)
Expand Down

0 comments on commit 7066980

Please sign in to comment.