diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-04-10 09:52:48 +1200 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-04-10 09:53:08 +1200 |
| commit | 93de9abe6d6847bce6db8da15f15b50b01972e70 (patch) | |
| tree | eb3cc744dfdab835e09137f466ca83a5b3daec9d /test | |
| parent | 23712f8ab95167953a6ca9a2b4296d80ceb475af (diff) | |
| parent | 833d98ae073daf0f25f786f043f2ffa85155c8ff (diff) | |
| download | bitcoin-93de9abe6d6847bce6db8da15f15b50b01972e70.tar.xz | |
Merge #15632: Remove ResendWalletTransactions from the Validation Interface
833d98ae0 [wallet] Remove unnecessary Chain::Lock parameter from ResendWalletTransactions (John Newbery)
52b760fc6 [wallet] Schedule tx rebroadcasts in wallet (John Newbery)
f463cd107 [wallet] Keep track of the best block time in the wallet (John Newbery)
Pull request description:
Remove the `Broadcast()`/`ResendWalletTransactions()` notification from the Validation interface.
Closes #15619. See that issue for discussion.
ACKs for commit 833d98:
ryanofsky:
utACK 833d98ae073daf0f25f786f043f2ffa85155c8ff. No changes, just rebase.
Tree-SHA512: 7689f2083608ebad8c95ab6692f7842754e1ebe5508bc926a89cad7105cce41007648f37341ba5feb92b30a7aa87acd3abf264a4f1874e35a7161553f6ff3595
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/wallet_resendwallettransactions.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index 8aafa94c2e..ec5e230e5a 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -39,6 +39,12 @@ class ResendWalletTransactionsTest(BitcoinTestFramework): self.log.info("Create a new transaction and wait until it's broadcast") txid = int(node.sendtoaddress(node.getnewaddress(), 1), 16) + # Wallet rebroadcast is first scheduled 1 sec after startup (see + # nNextResend in ResendWalletTransactions()). Sleep for just over a + # second to be certain that it has been called before the first + # setmocktime call below. + time.sleep(1.1) + # Can take a few seconds due to transaction trickling wait_until(lambda: node.p2p.tx_invs_received[txid] >= 1, lock=mininode_lock) |