test: Add missing sync_mempools() to fill

maflcko commented at 7:51 am on September 23, 2024: member

Not doing the sync will lead to (intermittent) issues, as explained in #30922 (comment).

Fix all issues by doing the sync by default and disable it in places that do not need the sync.

Fixes #30922

DrahtBot commented at 7:51 am on September 23, 2024: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	mzumsande, ismaelsadeeq, marcofleon

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

DrahtBot added the label Tests on Sep 23, 2024

maflcko commented at 8:11 am on September 23, 2024: member

Can be tested via the following diff, which should fail on master and pass on this pull request:

 0diff --git a/test/functional/p2p_1p1c_network.py b/test/functional/p2p_1p1c_network.py
 1index f9e782f524..5ea6add9ab 100755
 2--- a/test/functional/p2p_1p1c_network.py
 3+++ b/test/functional/p2p_1p1c_network.py
 4@@ -39,7 +39,7 @@ class PackageRelayTest(BitcoinTestFramework):
 5         self.setup_clean_chain = True
 6         self.num_nodes = 4
 7         # hugely speeds up the test, as it involves multiple hops of tx relay.
 8-        self.noban_tx_relay = True
 9+        #self.noban_tx_relay = True
10         self.extra_args = [[
11             "-datacarriersize=100000",
12             "-maxmempool=5",

Master:

0$ ./bld-cmake/test/functional/test_runner.py mempool_limit.py mempool_package_rbf.py p2p_1p1c_network.py p2p_opportunistic_1p1c.py p2p_tx_download.py rpc_packages.py
1
2...
3
4  File "./test/functional/p2p_1p1c_network.py", line 58, in raise_network_minfee
5    assert_greater_than(node.getmempoolinfo()['mempoolminfee'], FEERATE_1SAT_VB)
6  File "./test/functional/test_framework/util.py", line 82, in assert_greater_than
7    raise AssertionError("%s <= %s" % (str(thing1), str(thing2)))
8AssertionError: 0.00001000 <= 0.00001000

This pull:

0$ ./bld-cmake/test/functional/test_runner.py --timeout-factor=4 mempool_limit.py mempool_package_rbf.py p2p_1p1c_network.py p2p_opportunistic_1p1c.py p2p_tx_download.py rpc_packages.py
1
2... (passes)

in test/functional/test_framework/mempool_util.py:68 in fade238c64 outdated

64@@ -68,6 +65,7 @@ def fill_mempool(test_framework, node):
65             fee = (batch_of_txid + 1) * base_fee
66             utxos = confirmed_utxos[:tx_batch_size]
67             create_lots_of_big_transactions(ephemeral_miniwallet, node, fee, tx_batch_size, txouts, utxos)
68+            tx_sync_fun() if tx_sync_fun else test_framework.sync_mempools()

mzumsande commented at 4:55 pm on September 23, 2024:

This works, but it slows the test down a lot (runtime goes down from 17s to 1m 37s for me).

I think we actually only care that at least one tx gets evicted from the mempool of each node, so did you consider having only one sync call after the first large tx is generated (plus one at the end)? Note that it’s probably not enough to have the sync already after tx_to_be_evicted_id because that tx is so small that it could coexist with the final set of transactions (although I guess we could make it larger?).

This all seems a bit hacky to me, but it should have a much smaller impact on performance.

maflcko commented at 8:19 am on September 24, 2024:

Ok, I’ve reduced the number of syncs. However, I think it is clearer to do one sync before any eviction and one after all evictions. Otherwise, the fix seems fragile and incomplete, because there could be a tx that wasn’t synced and is later evicted (for example the third transaction, if the sync happens after the second one). While this wouldn’t lead to test failures right now, it seems brittle. I think all transactions should be added (and removed) on all nodes equally.

ismaelsadeeq commented at 4:43 pm on September 24, 2024:

on master

01/1 - p2p_1p1c_network.py passed, Duration: 14 s
1
2TEST                | STATUS    | DURATION
3
4p2p_1p1c_network.py | ✓ Passed  | 14 s
5
6ALL                 | ✓ Passed  | 14 s (accumulated) 
7Runtime: 14 s

On this PR without commenting self.noban_tx_relay = True

01/1 - p2p_1p1c_network.py passed, Duration: 15 s
1
2TEST                | STATUS    | DURATION
3
4p2p_1p1c_network.py | ✓ Passed  | 15 s
5
6ALL                 | ✓ Passed  | 15 s (accumulated) 
7Runtime: 15 s

On this PR after commenting self.noban_tx_relay = True

0Remaining jobs: [p2p_1p1c_network.py]
11/1 - p2p_1p1c_network.py passed, Duration: 90 s                                                                                                                                  
2
3TEST                | STATUS    | DURATION
4
5p2p_1p1c_network.py | ✓ Passed  | 90 s
6
7ALL                 | ✓ Passed  | 90 s (accumulated) 
8Runtime: 90 s

However I got timeout’s intermittently after running this PR with self.noban_tx_relay = True commented out

 0Temporary test directory at /var/folders/dj/d8p8jhd172n7wnq81ryfl6rc0000gn/T/test_runner_₿_🏃_20240924_173124
 1Remaining jobs: [p2p_1p1c_network.py]
 21/1 - p2p_1p1c_network.py failed, Duration: 65 s                                                                                  
 3
 4stdout:
 52024-09-24T16:31:24.919000Z TestFramework (INFO): PRNG seed is: 7691395298814659188
 62024-09-24T16:31:24.920000Z TestFramework (INFO): Initializing test directory /var/folders/dj/d8p8jhd172n7wnq81ryfl6rc0000gn/T/test_runner_₿_🏃_20240924_173124/p2p_1p1c_network_0
 72024-09-24T16:31:27.905000Z TestFramework (INFO): Fill mempools with large transactions to raise mempool minimum feerates
 82024-09-24T16:31:27.905000Z TestFramework (INFO): Fill the mempool until eviction is triggered and the mempoolminfee rises
 92024-09-24T16:32:30.007000Z TestFramework (ERROR): Assertion failed
10Traceback (most recent call last):
11  File "/Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/test/functional/test_framework/test_framework.py", line 132, in main
12    self.run_test()
13  File "/Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/build/test/functional/p2p_1p1c_network.py", line 134, in run_test
14    self.raise_network_minfee()
15  File "/Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/build/test/functional/p2p_1p1c_network.py", line 50, in raise_network_minfee
16    fill_mempool(self, self.nodes[0])
17  File "/Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/test/functional/test_framework/mempool_util.py", line 71, in fill_mempool
18    tx_sync_fun() if tx_sync_fun else test_framework.sync_mempools()  # sync before any eviction
19                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20  File "/Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/test/functional/test_framework/test_framework.py", line 781, in sync_mempools
21    raise AssertionError("Mempool sync timed out after {}s:{}".format(
22AssertionError: Mempool sync timed out after 60s:
23  {'44f7324d3b2e73d8e7a7142da1e83e519a81a5a9c6c3ea3a3c1c20dc7525bc70', 'edf0363ca6e560abb9d4971fcaa60a0dbd3a01d6cca1b00373ebc7091bf2f480', 'b347e49421bd36a9b1f85cf4111abca695342e818911c6704a133cf9a250d587', '7c17343eb6f9e5c347d014638f6937b49163958c23a396c482be26d9c994fb3b', '7fb91efb14081a56a74ac95f94570f2d4f934d390652f1f2e3b91602740d3cb3', 'e5b5cf041757620b5088bf499c391cc7fbe35b9c42f324ebff2c6508c12f07b1', '8d05e1d79830d4f6d7c7b1b3dc8b72d1622f662f6bbce3a09a684cc8208341aa', 'b59ffe65c519e9dbc3daaeb6bf314121b0ed6cea782b40f34ad742c126aec4cf', '19e3d3634b0232513e20203008ae065eb03f9d954240d77a94f623e45471a023', '84a72997569de67fd0f02ea349c507d1822ad4784a864b60082d7fcf3b9532f5', '86a336d2623e54ce061721814cc4c210f5ff9dd887606805f29ca06fa9767d81', '891a7b0e8a09960eb6c6361bd7ea74c960514c4005ac11cc03d194ad402371c6', '449768e2e3cc87e5d37a3848b8eccaccea8ec745fcfc9281963c09655b44bfa6', '382f8ef0f1ed0fdd8d7439510445812c883cccb12e7f9c2d6aea68d4a25165e8', '696197af5ecb53579191bbde9dbedcc52d1da0288454e57f96c523651e4232b0', 'f7374052d2d93e1eddf8f96c3715cec5086142a7f05d2d52f63e21797f035fd6', '29c2dd3062eb87d22a342505c23736a7cc18edcc0a38766cf597a327cb9bd7ed', 'bd6083efa3e715be9902402abc83e999ef850e51254fc5d050f98e6af7f1aa44', 'c0b4d761cb9d76149c0c2f07f8f7f16aa674eaf649b260aa17fc7935fdd31521', 'c860d9d47c4fb9d0f3b71bc605f48c85103effacce7d3de7c879fd9ed16e04c4', 'a93824625b08df7864e8ed4f94e9b56923169f2baba1d49dd39b23c098eca5de', '65a69d3ee97cce35d917e166883757018362c0c59efaff55b6bfb27a8e307a4c', '8bc7921bca22a8305f685db10d19bc42901099e49dfbe3ef3da69f550ab68d05', '629003445635dda60dddebcba039a7485e322391b3369c05e298c793f935bb39', 'a9342eac37c1d6015fa79bbced1bb2cf6bd5880b3d31f1ad5e3cecfdfcb5c083', '2132fe8517c9790ab37c71a3014750bca552c69d86c69675235a0efc016100ac', '5fd8faaf695ae759cc82dab3ef99fb46b16b13b99a86ca8bc81e49ecf4a56c27', 'b50824cae1d8da38a9ad1c32c76320d9f95a19f2b7463508e4b85e3e5377ffa9', '05d802a98ef4d36468572b4212f24dbb6d6ec39be0f9247e5747e6a279db2c12', 'd0d556839005294b5357489f80c9524552cab8ff3167ba7e08e6334ab751c64f', '8493a32406e263c969d69304c9678169d5b7f5fac2516827c2a95502319dc08f', 'ea9ab3a7be22d7162540fc50278d51d9895601eece5a3f158c2a39780492ee4a', '0373a98b7a3746e808cc20650f1fb5e90a98ab01ae3d4e452b3e7be0910bd3ff', '1a2c2d679c822045bb0c657e8924d94405da576544e98b7258748423b789befe', 'fd8bea9387e2fa1640cf7814537dd23b97f4a2f557be5f9e81a4f24897d0a78e', '9a11eb366b160aa9c783d733e3a5b2c700cb73af55f095d8d32e63e8539fa8db', '8c8725c5389e5a616dd7d7177db3c70d8156685d40538c970bbaa17b50dc872f', '155cbd7cddcc18a15b7de9232e209445db56926b654f53b3a5221c7ad0b63eec', '4ba247628917e81f3d8c89796e5c6e1336a1663a8bd3c9805de26b3467c16e0d', '9ae594e24940800a25a1ab21272ae03fada8701a6ed32a027cd31a751f432756', 'd71adfccec8a7c31cfa424d58c7d4c6c3a38c1827e65e21d44e72151fd92f7c4', '9b8d06dbe0cbefd4b5c43b4585e52bb50b11daef56a2fa059ebcb2ac41447d27', 'ae3f9cd2702f0e7c5c16b4ad988280c5ada1d75db21d899c2f56236fda045ac3', '297625b60a88fea0dcbccf669d8a6e3e570c7a4f7a49c3d8594a06a2bacb31d2', 'ff8505f666f4a042c593f4ffea871e3eb6835d46465a4f3a0ab50e5db98ae037', 'cdaa4113f52beb8089b99325df82990c0ade7ac874bb49638824d6af28bda381', '971298ac012ad7a96fd60b1d178d4151e4d12721d2a2bfcd80d93842c2e4bb3c', 'e0341b9176e2f1e853e64f1006b6ba533d25f8a6ff17d9e4db085e86e24b4e14', '351e47aac318d4f75442f304b095f62af4d4f4e2d258be054c4037ad9bcd55b8', '4c197ab71c49e8f6f05ca9900eb2593d79f31e13adea0f15f27af9aa59706962', '68d57172103ee08751f77e1752b4482bf91bcff96acc9632921c5e10fe7796d4', 'b99ddff3d5225f48bdcbbe74dbf2bf1b32cd7c03a9b32f2ed8ca5cce665d853a', 'ae7574742e903a6520d2f69073c77c8d645a7d7857ae89bec596fb3c84f3122e', '7a46a70ae5c63e7c93c68dc3c692341f84d8ce5bce4e2877838c599e2c45681e', 'e10bf094605c989d6c172bc913ad9b0f80ca42eef81826f6cadc7438c705c3fb', '294235124fd5a832820d61c15a359342a7dedadf65b7d73bf72f8e26c8cdcd0a', '41bb62786095449876fe4c617a2396ab8d2f85cd3b8e5a5c21a6930c68922623', '1922a595b93f79300d979c575061ad8e461df30f200df899aa8938daf2c0c12c', '0f5710bfdc6c61235d437a3d26d78612b2b83e591a4debe843b680803bbde542', 'de31824a123c23a356af093e4370498e60c2d03c596667d3dc69b6eb9c335c41', '436db623b3556cde1066c9140f080dfa15a296d4a6ecb11f157326cec9da091e', 'f2f276a4cd2bffadab80a566f01eec3d0ef7fbaa1dca4fb5ec0068588aa32bba', 'f3632166884cde259a44cb78d517c4d3a0e470196a04486abe9ae7c35a4681fc', '0335ba61e32c09b34dae5045376c5459ba53162c47a667267cbc1a5ad6070873', '6a538664d808af7ea9557cfd1fec0ff871e9678db77347e7373996bb2940098d', '88a863bdbc1e71e0588b5b5fdb36d993e3070390a8d02e4b55b3499241bee05f', 'd15d2e260d58d4dd4e991c06d2d1e3ce48e4ab8842ce7cfd16fa91e53bf08600', '4976b1f902924cfd5e61d26bef147a95ced0ee8ac39a3e10f9a62294480eed74', '2d8ea8136a81cf8f20a60b2a9d89d20d9f66941f4c795acaee6211082b536a65', '84a4956fa70cca6d8bbb25425c5aa94193631f01a9f31c6fe98d0f6e31d65b9f', '6b0537f96f193d1ef74c186d97699255434f9adb1df1e21d2d8d2e049687e428', 'ed73000d9fa4f80b153b90ecdd470c022b884a505a698a4645e274280c9f41cb', '571712d52e53f40c4c741c441a8aff809ee50084f8c6c97a3ee6ba2faf1ddb51'}
24  {'44f7324d3b2e73d8e7a7142da1e83e519a81a5a9c6c3ea3a3c1c20dc7525bc70', 'edf0363ca6e560abb9d4971fcaa60a0dbd3a01d6cca1b00373ebc7091bf2f480', 'b347e49421bd36a9b1f85cf4111abca695342e818911c6704a133cf9a250d587', '7c17343eb6f9e5c347d014638f6937b49163958c23a396c482be26d9c994fb3b', '7fb91efb14081a56a74ac95f94570f2d4f934d390652f1f2e3b91602740d3cb3', 'e5b5cf041757620b5088bf499c391cc7fbe35b9c42f324ebff2c6508c12f07b1', '8d05e1d79830d4f6d7c7b1b3dc8b72d1622f662f6bbce3a09a684cc8208341aa', 'b59ffe65c519e9dbc3daaeb6bf314121b0ed6cea782b40f34ad742c126aec4cf', '19e3d3634b0232513e20203008ae065eb03f9d954240d77a94f623e45471a023', '84a72997569de67fd0f02ea349c507d1822ad4784a864b60082d7fcf3b9532f5', '86a336d2623e54ce061721814cc4c210f5ff9dd887606805f29ca06fa9767d81', '891a7b0e8a09960eb6c6361bd7ea74c960514c4005ac11cc03d194ad402371c6', '449768e2e3cc87e5d37a3848b8eccaccea8ec745fcfc9281963c09655b44bfa6', '382f8ef0f1ed0fdd8d7439510445812c883cccb12e7f9c2d6aea68d4a25165e8', '696197af5ecb53579191bbde9dbedcc52d1da0288454e57f96c523651e4232b0', 'f7374052d2d93e1eddf8f96c3715cec5086142a7f05d2d52f63e21797f035fd6', '29c2dd3062eb87d22a342505c23736a7cc18edcc0a38766cf597a327cb9bd7ed', 'bd6083efa3e715be9902402abc83e999ef850e51254fc5d050f98e6af7f1aa44', 'c0b4d761cb9d76149c0c2f07f8f7f16aa674eaf649b260aa17fc7935fdd31521', 'c860d9d47c4fb9d0f3b71bc605f48c85103effacce7d3de7c879fd9ed16e04c4', 'a93824625b08df7864e8ed4f94e9b56923169f2baba1d49dd39b23c098eca5de', '65a69d3ee97cce35d917e166883757018362c0c59efaff55b6bfb27a8e307a4c', '8bc7921bca22a8305f685db10d19bc42901099e49dfbe3ef3da69f550ab68d05', '629003445635dda60dddebcba039a7485e322391b3369c05e298c793f935bb39', 'a9342eac37c1d6015fa79bbced1bb2cf6bd5880b3d31f1ad5e3cecfdfcb5c083', '2132fe8517c9790ab37c71a3014750bca552c69d86c69675235a0efc016100ac', '5fd8faaf695ae759cc82dab3ef99fb46b16b13b99a86ca8bc81e49ecf4a56c27', 'b50824cae1d8da38a9ad1c32c76320d9f95a19f2b7463508e4b85e3e5377ffa9', '05d802a98ef4d36468572b4212f24dbb6d6ec39be0f9247e5747e6a279db2c12', 'd0d556839005294b5357489f80c9524552cab8ff3167ba7e08e6334ab751c64f', '8493a32406e263c969d69304c9678169d5b7f5fac2516827c2a95502319dc08f', 'ea9ab3a7be22d7162540fc50278d51d9895601eece5a3f158c2a39780492ee4a', '0373a98b7a3746e808cc20650f1fb5e90a98ab01ae3d4e452b3e7be0910bd3ff', '1a2c2d679c822045bb0c657e8924d94405da576544e98b7258748423b789befe', 'fd8bea9387e2fa1640cf7814537dd23b97f4a2f557be5f9e81a4f24897d0a78e', '9a11eb366b160aa9c783d733e3a5b2c700cb73af55f095d8d32e63e8539fa8db', '8c8725c5389e5a616dd7d7177db3c70d8156685d40538c970bbaa17b50dc872f', '155cbd7cddcc18a15b7de9232e209445db56926b654f53b3a5221c7ad0b63eec', '4ba247628917e81f3d8c89796e5c6e1336a1663a8bd3c9805de26b3467c16e0d', '9ae594e24940800a25a1ab21272ae03fada8701a6ed32a027cd31a751f432756', 'd71adfccec8a7c31cfa424d58c7d4c6c3a38c1827e65e21d44e72151fd92f7c4', '9b8d06dbe0cbefd4b5c43b4585e52bb50b11daef56a2fa059ebcb2ac41447d27', 'ae3f9cd2702f0e7c5c16b4ad988280c5ada1d75db21d899c2f56236fda045ac3', '297625b60a88fea0dcbccf669d8a6e3e570c7a4f7a49c3d8594a06a2bacb31d2', 'ff8505f666f4a042c593f4ffea871e3eb6835d46465a4f3a0ab50e5db98ae037', 'cdaa4113f52beb8089b99325df82990c0ade7ac874bb49638824d6af28bda381', '971298ac012ad7a96fd60b1d178d4151e4d12721d2a2bfcd80d93842c2e4bb3c', 'e0341b9176e2f1e853e64f1006b6ba533d25f8a6ff17d9e4db085e86e24b4e14', '351e47aac318d4f75442f304b095f62af4d4f4e2d258be054c4037ad9bcd55b8', '4c197ab71c49e8f6f05ca9900eb2593d79f31e13adea0f15f27af9aa59706962', '68d57172103ee08751f77e1752b4482bf91bcff96acc9632921c5e10fe7796d4', 'b99ddff3d5225f48bdcbbe74dbf2bf1b32cd7c03a9b32f2ed8ca5cce665d853a', 'ae7574742e903a6520d2f69073c77c8d645a7d7857ae89bec596fb3c84f3122e', '7a46a70ae5c63e7c93c68dc3c692341f84d8ce5bce4e2877838c599e2c45681e', 'e10bf094605c989d6c172bc913ad9b0f80ca42eef81826f6cadc7438c705c3fb', '294235124fd5a832820d61c15a359342a7dedadf65b7d73bf72f8e26c8cdcd0a', '41bb62786095449876fe4c617a2396ab8d2f85cd3b8e5a5c21a6930c68922623', '1922a595b93f79300d979c575061ad8e461df30f200df899aa8938daf2c0c12c', '0f5710bfdc6c61235d437a3d26d78612b2b83e591a4debe843b680803bbde542', 'de31824a123c23a356af093e4370498e60c2d03c596667d3dc69b6eb9c335c41', '436db623b3556cde1066c9140f080dfa15a296d4a6ecb11f157326cec9da091e', 'f2f276a4cd2bffadab80a566f01eec3d0ef7fbaa1dca4fb5ec0068588aa32bba', 'f3632166884cde259a44cb78d517c4d3a0e470196a04486abe9ae7c35a4681fc', '0335ba61e32c09b34dae5045376c5459ba53162c47a667267cbc1a5ad6070873', '6a538664d808af7ea9557cfd1fec0ff871e9678db77347e7373996bb2940098d', '88a863bdbc1e71e0588b5b5fdb36d993e3070390a8d02e4b55b3499241bee05f', 'd15d2e260d58d4dd4e991c06d2d1e3ce48e4ab8842ce7cfd16fa91e53bf08600', '4976b1f902924cfd5e61d26bef147a95ced0ee8ac39a3e10f9a62294480eed74', '2d8ea8136a81cf8f20a60b2a9d89d20d9f66941f4c795acaee6211082b536a65', '84a4956fa70cca6d8bbb25425c5aa94193631f01a9f31c6fe98d0f6e31d65b9f', '6b0537f96f193d1ef74c186d97699255434f9adb1df1e21d2d8d2e049687e428', 'ed73000d9fa4f80b153b90ecdd470c022b884a505a698a4645e274280c9f41cb', '571712d52e53f40c4c741c441a8aff809ee50084f8c6c97a3ee6ba2faf1ddb51'}
25  {'44f7324d3b2e73d8e7a7142da1e83e519a81a5a9c6c3ea3a3c1c20dc7525bc70', 'edf0363ca6e560abb9d4971fcaa60a0dbd3a01d6cca1b00373ebc7091bf2f480', 'b347e49421bd36a9b1f85cf4111abca695342e818911c6704a133cf9a250d587', '7c17343eb6f9e5c347d014638f6937b49163958c23a396c482be26d9c994fb3b', '7fb91efb14081a56a74ac95f94570f2d4f934d390652f1f2e3b91602740d3cb3', 'e5b5cf041757620b5088bf499c391cc7fbe35b9c42f324ebff2c6508c12f07b1', '8d05e1d79830d4f6d7c7b1b3dc8b72d1622f662f6bbce3a09a684cc8208341aa', 'b59ffe65c519e9dbc3daaeb6bf314121b0ed6cea782b40f34ad742c126aec4cf', '19e3d3634b0232513e20203008ae065eb03f9d954240d77a94f623e45471a023', '84a72997569de67fd0f02ea349c507d1822ad4784a864b60082d7fcf3b9532f5', '86a336d2623e54ce061721814cc4c210f5ff9dd887606805f29ca06fa9767d81', '891a7b0e8a09960eb6c6361bd7ea74c960514c4005ac11cc03d194ad402371c6', '449768e2e3cc87e5d37a3848b8eccaccea8ec745fcfc9281963c09655b44bfa6', '382f8ef0f1ed0fdd8d7439510445812c883cccb12e7f9c2d6aea68d4a25165e8', '696197af5ecb53579191bbde9dbedcc52d1da0288454e57f96c523651e4232b0', 'f7374052d2d93e1eddf8f96c3715cec5086142a7f05d2d52f63e21797f035fd6', '29c2dd3062eb87d22a342505c23736a7cc18edcc0a38766cf597a327cb9bd7ed', 'bd6083efa3e715be9902402abc83e999ef850e51254fc5d050f98e6af7f1aa44', 'c0b4d761cb9d76149c0c2f07f8f7f16aa674eaf649b260aa17fc7935fdd31521', 'c860d9d47c4fb9d0f3b71bc605f48c85103effacce7d3de7c879fd9ed16e04c4', 'a93824625b08df7864e8ed4f94e9b56923169f2baba1d49dd39b23c098eca5de', '65a69d3ee97cce35d917e166883757018362c0c59efaff55b6bfb27a8e307a4c', '8bc7921bca22a8305f685db10d19bc42901099e49dfbe3ef3da69f550ab68d05', '629003445635dda60dddebcba039a7485e322391b3369c05e298c793f935bb39', 'a9342eac37c1d6015fa79bbced1bb2cf6bd5880b3d31f1ad5e3cecfdfcb5c083', '2132fe8517c9790ab37c71a3014750bca552c69d86c69675235a0efc016100ac', '5fd8faaf695ae759cc82dab3ef99fb46b16b13b99a86ca8bc81e49ecf4a56c27', 'b50824cae1d8da38a9ad1c32c76320d9f95a19f2b7463508e4b85e3e5377ffa9', '05d802a98ef4d36468572b4212f24dbb6d6ec39be0f9247e5747e6a279db2c12', 'd0d556839005294b5357489f80c9524552cab8ff3167ba7e08e6334ab751c64f', '8493a32406e263c969d69304c9678169d5b7f5fac2516827c2a95502319dc08f', 'ea9ab3a7be22d7162540fc50278d51d9895601eece5a3f158c2a39780492ee4a', '0373a98b7a3746e808cc20650f1fb5e90a98ab01ae3d4e452b3e7be0910bd3ff', '1a2c2d679c822045bb0c657e8924d94405da576544e98b7258748423b789befe', 'fd8bea9387e2fa1640cf7814537dd23b97f4a2f557be5f9e81a4f24897d0a78e', '9a11eb366b160aa9c783d733e3a5b2c700cb73af55f095d8d32e63e8539fa8db', '8c8725c5389e5a616dd7d7177db3c70d8156685d40538c970bbaa17b50dc872f', '155cbd7cddcc18a15b7de9232e209445db56926b654f53b3a5221c7ad0b63eec', '4ba247628917e81f3d8c89796e5c6e1336a1663a8bd3c9805de26b3467c16e0d', '9ae594e24940800a25a1ab21272ae03fada8701a6ed32a027cd31a751f432756', 'd71adfccec8a7c31cfa424d58c7d4c6c3a38c1827e65e21d44e72151fd92f7c4', '9b8d06dbe0cbefd4b5c43b4585e52bb50b11daef56a2fa059ebcb2ac41447d27', 'ae3f9cd2702f0e7c5c16b4ad988280c5ada1d75db21d899c2f56236fda045ac3', '297625b60a88fea0dcbccf669d8a6e3e570c7a4f7a49c3d8594a06a2bacb31d2', 'ff8505f666f4a042c593f4ffea871e3eb6835d46465a4f3a0ab50e5db98ae037', 'cdaa4113f52beb8089b99325df82990c0ade7ac874bb49638824d6af28bda381', '971298ac012ad7a96fd60b1d178d4151e4d12721d2a2bfcd80d93842c2e4bb3c', 'e0341b9176e2f1e853e64f1006b6ba533d25f8a6ff17d9e4db085e86e24b4e14', '351e47aac318d4f75442f304b095f62af4d4f4e2d258be054c4037ad9bcd55b8', '4c197ab71c49e8f6f05ca9900eb2593d79f31e13adea0f15f27af9aa59706962', '68d57172103ee08751f77e1752b4482bf91bcff96acc9632921c5e10fe7796d4', 'b99ddff3d5225f48bdcbbe74dbf2bf1b32cd7c03a9b32f2ed8ca5cce665d853a', 'ae7574742e903a6520d2f69073c77c8d645a7d7857ae89bec596fb3c84f3122e', '7a46a70ae5c63e7c93c68dc3c692341f84d8ce5bce4e2877838c599e2c45681e', 'e10bf094605c989d6c172bc913ad9b0f80ca42eef81826f6cadc7438c705c3fb', '294235124fd5a832820d61c15a359342a7dedadf65b7d73bf72f8e26c8cdcd0a', '41bb62786095449876fe4c617a2396ab8d2f85cd3b8e5a5c21a6930c68922623', '1922a595b93f79300d979c575061ad8e461df30f200df899aa8938daf2c0c12c', '0f5710bfdc6c61235d437a3d26d78612b2b83e591a4debe843b680803bbde542', 'de31824a123c23a356af093e4370498e60c2d03c596667d3dc69b6eb9c335c41', '436db623b3556cde1066c9140f080dfa15a296d4a6ecb11f157326cec9da091e', 'f2f276a4cd2bffadab80a566f01eec3d0ef7fbaa1dca4fb5ec0068588aa32bba', 'f3632166884cde259a44cb78d517c4d3a0e470196a04486abe9ae7c35a4681fc', '0335ba61e32c09b34dae5045376c5459ba53162c47a667267cbc1a5ad6070873', '6a538664d808af7ea9557cfd1fec0ff871e9678db77347e7373996bb2940098d', '88a863bdbc1e71e0588b5b5fdb36d993e3070390a8d02e4b55b3499241bee05f', 'd15d2e260d58d4dd4e991c06d2d1e3ce48e4ab8842ce7cfd16fa91e53bf08600', '4976b1f902924cfd5e61d26bef147a95ced0ee8ac39a3e10f9a62294480eed74', '2d8ea8136a81cf8f20a60b2a9d89d20d9f66941f4c795acaee6211082b536a65', '84a4956fa70cca6d8bbb25425c5aa94193631f01a9f31c6fe98d0f6e31d65b9f', '6b0537f96f193d1ef74c186d97699255434f9adb1df1e21d2d8d2e049687e428', 'ed73000d9fa4f80b153b90ecdd470c022b884a505a698a4645e274280c9f41cb', '571712d52e53f40c4c741c441a8aff809ee50084f8c6c97a3ee6ba2faf1ddb51'}
26  {'44f7324d3b2e73d8e7a7142da1e83e519a81a5a9c6c3ea3a3c1c20dc7525bc70', 'edf0363ca6e560abb9d4971fcaa60a0dbd3a01d6cca1b00373ebc7091bf2f480', 'b347e49421bd36a9b1f85cf4111abca695342e818911c6704a133cf9a250d587', '7c17343eb6f9e5c347d014638f6937b49163958c23a396c482be26d9c994fb3b', '7fb91efb14081a56a74ac95f94570f2d4f934d390652f1f2e3b91602740d3cb3', 'e5b5cf041757620b5088bf499c391cc7fbe35b9c42f324ebff2c6508c12f07b1', '8d05e1d79830d4f6d7c7b1b3dc8b72d1622f662f6bbce3a09a684cc8208341aa', 'b59ffe65c519e9dbc3daaeb6bf314121b0ed6cea782b40f34ad742c126aec4cf', '19e3d3634b0232513e20203008ae065eb03f9d954240d77a94f623e45471a023', '84a72997569de67fd0f02ea349c507d1822ad4784a864b60082d7fcf3b9532f5', '86a336d2623e54ce061721814cc4c210f5ff9dd887606805f29ca06fa9767d81', '891a7b0e8a09960eb6c6361bd7ea74c960514c4005ac11cc03d194ad402371c6', '449768e2e3cc87e5d37a3848b8eccaccea8ec745fcfc9281963c09655b44bfa6', '382f8ef0f1ed0fdd8d7439510445812c883cccb12e7f9c2d6aea68d4a25165e8', '696197af5ecb53579191bbde9dbedcc52d1da0288454e57f96c523651e4232b0', 'f7374052d2d93e1eddf8f96c3715cec5086142a7f05d2d52f63e21797f035fd6', '29c2dd3062eb87d22a342505c23736a7cc18edcc0a38766cf597a327cb9bd7ed', 'bd6083efa3e715be9902402abc83e999ef850e51254fc5d050f98e6af7f1aa44', 'c0b4d761cb9d76149c0c2f07f8f7f16aa674eaf649b260aa17fc7935fdd31521', 'c860d9d47c4fb9d0f3b71bc605f48c85103effacce7d3de7c879fd9ed16e04c4', 'a93824625b08df7864e8ed4f94e9b56923169f2baba1d49dd39b23c098eca5de', '65a69d3ee97cce35d917e166883757018362c0c59efaff55b6bfb27a8e307a4c', '8bc7921bca22a8305f685db10d19bc42901099e49dfbe3ef3da69f550ab68d05', '629003445635dda60dddebcba039a7485e322391b3369c05e298c793f935bb39', 'a9342eac37c1d6015fa79bbced1bb2cf6bd5880b3d31f1ad5e3cecfdfcb5c083', '2132fe8517c9790ab37c71a3014750bca552c69d86c69675235a0efc016100ac', '5fd8faaf695ae759cc82dab3ef99fb46b16b13b99a86ca8bc81e49ecf4a56c27', 'b50824cae1d8da38a9ad1c32c76320d9f95a19f2b7463508e4b85e3e5377ffa9', '05d802a98ef4d36468572b4212f24dbb6d6ec39be0f9247e5747e6a279db2c12', 'd0d556839005294b5357489f80c9524552cab8ff3167ba7e08e6334ab751c64f', 'ea9ab3a7be22d7162540fc50278d51d9895601eece5a3f158c2a39780492ee4a', '0373a98b7a3746e808cc20650f1fb5e90a98ab01ae3d4e452b3e7be0910bd3ff', '1a2c2d679c822045bb0c657e8924d94405da576544e98b7258748423b789befe', 'fd8bea9387e2fa1640cf7814537dd23b97f4a2f557be5f9e81a4f24897d0a78e', '9a11eb366b160aa9c783d733e3a5b2c700cb73af55f095d8d32e63e8539fa8db', '8c8725c5389e5a616dd7d7177db3c70d8156685d40538c970bbaa17b50dc872f', '155cbd7cddcc18a15b7de9232e209445db56926b654f53b3a5221c7ad0b63eec', '4ba247628917e81f3d8c89796e5c6e1336a1663a8bd3c9805de26b3467c16e0d', '9ae594e24940800a25a1ab21272ae03fada8701a6ed32a027cd31a751f432756', '9b8d06dbe0cbefd4b5c43b4585e52bb50b11daef56a2fa059ebcb2ac41447d27', 'ae3f9cd2702f0e7c5c16b4ad988280c5ada1d75db21d899c2f56236fda045ac3', '297625b60a88fea0dcbccf669d8a6e3e570c7a4f7a49c3d8594a06a2bacb31d2', 'ff8505f666f4a042c593f4ffea871e3eb6835d46465a4f3a0ab50e5db98ae037', 'cdaa4113f52beb8089b99325df82990c0ade7ac874bb49638824d6af28bda381', '971298ac012ad7a96fd60b1d178d4151e4d12721d2a2bfcd80d93842c2e4bb3c', 'e0341b9176e2f1e853e64f1006b6ba533d25f8a6ff17d9e4db085e86e24b4e14', '351e47aac318d4f75442f304b095f62af4d4f4e2d258be054c4037ad9bcd55b8', '4c197ab71c49e8f6f05ca9900eb2593d79f31e13adea0f15f27af9aa59706962', '68d57172103ee08751f77e1752b4482bf91bcff96acc9632921c5e10fe7796d4', 'b99ddff3d5225f48bdcbbe74dbf2bf1b32cd7c03a9b32f2ed8ca5cce665d853a', 'ae7574742e903a6520d2f69073c77c8d645a7d7857ae89bec596fb3c84f3122e', '7a46a70ae5c63e7c93c68dc3c692341f84d8ce5bce4e2877838c599e2c45681e', 'e10bf094605c989d6c172bc913ad9b0f80ca42eef81826f6cadc7438c705c3fb', '294235124fd5a832820d61c15a359342a7dedadf65b7d73bf72f8e26c8cdcd0a', '41bb62786095449876fe4c617a2396ab8d2f85cd3b8e5a5c21a6930c68922623', '1922a595b93f79300d979c575061ad8e461df30f200df899aa8938daf2c0c12c', '0f5710bfdc6c61235d437a3d26d78612b2b83e591a4debe843b680803bbde542', 'de31824a123c23a356af093e4370498e60c2d03c596667d3dc69b6eb9c335c41', '436db623b3556cde1066c9140f080dfa15a296d4a6ecb11f157326cec9da091e', 'f2f276a4cd2bffadab80a566f01eec3d0ef7fbaa1dca4fb5ec0068588aa32bba', 'f3632166884cde259a44cb78d517c4d3a0e470196a04486abe9ae7c35a4681fc', '0335ba61e32c09b34dae5045376c5459ba53162c47a667267cbc1a5ad6070873', '6a538664d808af7ea9557cfd1fec0ff871e9678db77347e7373996bb2940098d', '88a863bdbc1e71e0588b5b5fdb36d993e3070390a8d02e4b55b3499241bee05f', 'd15d2e260d58d4dd4e991c06d2d1e3ce48e4ab8842ce7cfd16fa91e53bf08600', '4976b1f902924cfd5e61d26bef147a95ced0ee8ac39a3e10f9a62294480eed74', '2d8ea8136a81cf8f20a60b2a9d89d20d9f66941f4c795acaee6211082b536a65', '84a4956fa70cca6d8bbb25425c5aa94193631f01a9f31c6fe98d0f6e31d65b9f', 'ed73000d9fa4f80b153b90ecdd470c022b884a505a698a4645e274280c9f41cb', '571712d52e53f40c4c741c441a8aff809ee50084f8c6c97a3ee6ba2faf1ddb51'}
272024-09-24T16:32:30.069000Z TestFramework (INFO): Stopping nodes
282024-09-24T16:32:30.238000Z TestFramework (WARNING): Not cleaning up dir /var/folders/dj/d8p8jhd172n7wnq81ryfl6rc0000gn/T/test_runner_₿_🏃_20240924_173124/p2p_1p1c_network_0
292024-09-24T16:32:30.238000Z TestFramework (ERROR): Test failed. Test logging available at /var/folders/dj/d8p8jhd172n7wnq81ryfl6rc0000gn/T/test_runner_₿_🏃_20240924_173124/p2p_1p1c_network_0/test_framework.log
302024-09-24T16:32:30.238000Z TestFramework (ERROR): 
312024-09-24T16:32:30.238000Z TestFramework (ERROR): Hint: Call /Users/abubakarismail/Desktop/Work/bitcoin-dev/bitcoin/test/functional/combine_logs.py '/var/folders/dj/d8p8jhd172n7wnq81ryfl6rc0000gn/T/test_runner_₿_🏃_20240924_173124/p2p_1p1c_network_0' to consolidate all logs
322024-09-24T16:32:30.238000Z TestFramework (ERROR): 
332024-09-24T16:32:30.238000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
342024-09-24T16:32:30.238000Z TestFramework (ERROR): https://github.com/bitcoin/bitcoin/issues
352024-09-24T16:32:30.238000Z TestFramework (ERROR): 
36
37
38stderr:
39
40
41
42TEST                | STATUS    | DURATION
43
44p2p_1p1c_network.py | ✖ Failed  | 65 s
45
46ALL                 | ✖ Failed  | 65 s (accumulated) 
47Runtime: 65 s

maflcko commented at 4:57 pm on September 24, 2024:

However I got timeout’s intermittently after running this PR with self.noban_tx_relay = True commented out

tx relay may take time, if trickle is enabled. Especially if many nodes are hopped. You’ll have to increase the timeout-factor as explained in #30948 (comment)

ismaelsadeeq commented at 6:56 pm on September 24, 2024:

Thanks, by the way this was Tested ACK faf801515f8fcd11a3454105cab66c38f6f240fe

maflcko commented at 12:05 pm on September 25, 2024:

by the way this was Tested ACK

Reviews in resolved conversations are unlikely to be seen. My recommendation would be to put them in a normal comment that isn’t hidden.

mzumsande commented at 5:03 pm on September 23, 2024: contributor

Concept ACK, one question

test: Refactor fill_mempool to extract send_batch helper

This is needed for the next commit

fa48be6f02

maflcko force-pushed on Sep 24, 2024

test: Add missing sync_mempools() to fill_mempool()

Also disable the function, when it is not needed.

faf801515f

maflcko force-pushed on Sep 24, 2024

mzumsande commented at 5:43 pm on September 24, 2024: contributor

Tested ACK faf801515f8fcd11a3454105cab66c38f6f240fe

ismaelsadeeq commented at 12:30 pm on September 25, 2024: member

Tested ACK faf801515f8fcd11a3454105cab66c38f6f240fe

marcofleon commented at 3:28 pm on September 26, 2024: contributor

Tested ACK faf801515f8fcd11a3454105cab66c38f6f240fe

Saw AssertionError: 0.00001000 <= 0.00001000 on master.

On this branch:

 0TEST                      | STATUS    | DURATION
 1
 2mempool_limit.py          | ✓ Passed  | 6 s
 3mempool_package_rbf.py    | ✓ Passed  | 24 s
 4p2p_1p1c_network.py       | ✓ Passed  | 53 s
 5p2p_opportunistic_1p1c.py | ✓ Passed  | 43 s
 6p2p_tx_download.py        | ✓ Passed  | 31 s
 7rpc_packages.py           | ✓ Passed  | 4 s
 8
 9ALL                       | ✓ Passed  | 161 s (accumulated) 
10Runtime: 53 s

fanquake merged this on Sep 26, 2024

fanquake closed this on Sep 26, 2024

maflcko deleted the branch on Sep 26, 2024

test: Add missing sync_mempools() to fill_mempool() #30948

Code Coverage

Reviews