Skip to content

Commit

Permalink
Merge bitcoin#28321: test: Fix intermittent issue in mempool_reorg
Browse files Browse the repository at this point in the history
fa5cc3c test: Fix intermittent issue in mempool_reorg (MarcoFalke)

Pull request description:

  Currently the test case may fail intermittently, see bitcoin#28313

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

ACKs for top commit:
  glozow:
    ACK fa5cc3c

Tree-SHA512: ff552111b434ca712c7dbdc5ba32a986a6fa4512cba5a756234eae69428063bf6ecfdc8f350ee84226ed4d3e4262b4639dbe49162a722e8da85f0d61e5690c51
  • Loading branch information
fanquake committed Aug 24, 2023
2 parents cd5d2f5 + fa5cc3c commit e0ad847
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/functional/mempool_reorg.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def test_reorg_relay(self):
assert_equal(self.nodes[1].getmempoolentry(tx_child["txid"])["ancestorcount"], 2)
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
# enough time has elapsed for those transactions to be announced. Likewise, it cannot
# peer1 should not have received an inv for any of the transactions during this time, as no
# mocktime has elapsed for those transactions to be announced. Likewise, it cannot
# request very recent, unanounced transactions.
assert_equal(len(peer1.get_invs()), 0)
# It's too early to request these two transactions
Expand All @@ -92,7 +92,7 @@ def test_reorg_relay(self):
# 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())

self.nodes[1].setmocktime(int(time.time()) + 30)
self.nodes[1].setmocktime(int(time.time()) + 300)
peer1.sync_with_ping()
# the transactions are now announced
assert_equal(len(peer1.get_invs()), 3)
Expand Down

0 comments on commit e0ad847

Please sign in to comment.