sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#29948: test: add missing comparison of node1's mempool in MempoolPackagesTest

Browse Source 
e912717ff63f111d8f1cd7ed1fcf054e28f36409 test: add missing comparison of node1's mempool in MempoolPackagesTest (umiumi)

Pull request description:

  #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 #21800   ,  so I removed the todo for those two size limits.

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

Tree-SHA512: 8cb51746b0547369344c9ceef59599bfe9c91d424687af5e24dc6641f9e99fb433515d79c724e71fd3d5e02994f0cef623d3674367b8296b05c3c6fcdde282ef
This commit is contained in:
Ava Chow 2024-05-10 12:44:42 -04:00 committed by pasta
parent f1907ea997
commit a0cd305a7c
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/functional/mempool_packages.py
View File

@ -201,13 +201,13 @@ class MempoolPackagesTest(BitcoinTestFramework):
assert set(mempool1).issubset(set(mempool0)) assert set(mempool1).issubset(set(mempool0))
for tx in chain[:MAX_ANCESTORS_CUSTOM]: for tx in chain[:MAX_ANCESTORS_CUSTOM]:
assert tx in mempool1 assert tx in mempool1
# TODO: more detailed check of node1's mempool (fees etc.) entry0 = self.nodes[0].getmempoolentry(tx)
# check transaction unbroadcast info (should be false if in both mempools) entry1 = self.nodes[1].getmempoolentry(tx)
mempool = self.nodes[0].getrawmempool(True) assert not entry0['unbroadcast']
for tx in mempool: assert not entry1['unbroadcast']
assert_equal(mempool[tx]['unbroadcast'], False) assert_equal(entry1['fees']['base'], entry0['fees']['base'])
assert_equal(entry1['vsize'], entry0['vsize'])
# TODO: test ancestor size limits assert_equal(entry1['depends'], entry0['depends'])
# Now test descendant chain limits # Now test descendant chain limits
txid = utxo[1]['txid'] txid = utxo[1]['txid']
@ -258,10 +258,14 @@ class MempoolPackagesTest(BitcoinTestFramework):
assert tx in mempool1 assert tx in mempool1
for tx in chain[MAX_DESCENDANTS_CUSTOM:]: for tx in chain[MAX_DESCENDANTS_CUSTOM:]:
assert tx not in mempool1 assert tx not in mempool1
# TODO: more detailed check of node1's mempool (fees etc.) for tx in mempool1:
entry0 = self.nodes[0].getmempoolentry(tx)
# TODO: test descendant size limits 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 # Test reorg handling
# First, the basics: # First, the basics:
self.generate(self.nodes[0], 1) self.generate(self.nodes[0], 1)