Merge bitcoin/bitcoin#28321: test: Fix intermittent issue in mempool_reorg

fa5cc3ccfb test: Fix intermittent issue in mempool_reorg (MarcoFalke)

Pull request description:

  Currently the test case may fail intermittently, see https://github.com/bitcoin/bitcoin/issues/28313

  Fix this by changing a number and reducing the failure rate a bit.

ACKs for top commit:
  glozow:
    ACK fa5cc3ccfb

Tree-SHA512: ff552111b434ca712c7dbdc5ba32a986a6fa4512cba5a756234eae69428063bf6ecfdc8f350ee84226ed4d3e4262b4639dbe49162a722e8da85f0d61e5690c51
This commit is contained in:
fanquake 2023-08-24 10:01:50 +01:00
commit e0ad847073
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1

View File

@ -68,8 +68,8 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
assert_equal(self.nodes[1].getmempoolentry(tx_child["txid"])["ancestorcount"], 2) assert_equal(self.nodes[1].getmempoolentry(tx_child["txid"])["ancestorcount"], 2)
assert_equal(self.nodes[1].getmempoolentry(tx_before_reorg["txid"])["ancestorcount"], 1) assert_equal(self.nodes[1].getmempoolentry(tx_before_reorg["txid"])["ancestorcount"], 1)
# peer1 should not have received an inv for any of the transactions during this time, as not # peer1 should not have received an inv for any of the transactions during this time, as no
# enough time has elapsed for those transactions to be announced. Likewise, it cannot # mocktime has elapsed for those transactions to be announced. Likewise, it cannot
# request very recent, unanounced transactions. # request very recent, unanounced transactions.
assert_equal(len(peer1.get_invs()), 0) assert_equal(len(peer1.get_invs()), 0)
# It's too early to request these two transactions # It's too early to request these two transactions
@ -92,7 +92,7 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
# However, the node will answer requests for the tx from the recently-disconnected block. # However, the node will answer requests for the tx from the recently-disconnected block.
assert_equal(peer1.last_message["tx"].tx.getwtxid(),tx_disconnected["tx"].getwtxid()) assert_equal(peer1.last_message["tx"].tx.getwtxid(),tx_disconnected["tx"].getwtxid())
self.nodes[1].setmocktime(int(time.time()) + 30) self.nodes[1].setmocktime(int(time.time()) + 300)
peer1.sync_with_ping() peer1.sync_with_ping()
# the transactions are now announced # the transactions are now announced
assert_equal(len(peer1.get_invs()), 3) assert_equal(len(peer1.get_invs()), 3)