diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-05-01 14:59:55 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-05-01 15:02:31 -0400 |
| commit | 0936f35f65ad778c1308f00b42b6182c7e64270f (patch) | |
| tree | 3b7c1eb93f23232797fb8f06694d2fcca892c232 /src/wallet/wallet.h | |
| parent | 12aa2ac988d0ccb21019a20b109e018cf31b78cf (diff) | |
| parent | 422677963a7b41e340b911b4cd53d29dd8d63f21 (diff) | |
| download | bitcoin-0936f35f65ad778c1308f00b42b6182c7e64270f.tar.xz | |
Merge #15842: refactor: replace isPotentialtip/waitForNotifications by higher method
422677963a refactor: replace isPotentialtip/waitForNotifications by higher method (Antoine Riard)
edfe9438ca Add WITH_LOCK macro: run code while locking a mutex (Antoine Riard)
Pull request description:
In Chain interface, instead of a isPotentialTip and a WaitForNotifications method, both used only once in CWallet::BlockUntilSyncedToCurrentChain, combine them in a higher WaitForNotificationsUpToTip method. Semantic should be unchanged, wallet wait for pending notifications to be processed unless block hash points to the current chain tip or a descendant.
ACKs for commit 422677:
jnewbery:
ACK 422677963a7b41e340b911b4cd53d29dd8d63f21
ryanofsky:
utACK 422677963a7b41e340b911b4cd53d29dd8d63f21. Only change is adding the cs_wallet lock annotation.
Tree-SHA512: 2834ff0218795ef607543fae822e5cce25d759c1a9cfcb1f896a4af03071faed5276fbe0966e0c6ed65dc0e88af161899c5b2ca358a2d24fe70969a550000bf2
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 900af75f4f..510f4b8c04 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -693,7 +693,7 @@ private: * to have seen all transactions in the chain, but is only used to track * live BlockConnected callbacks. */ - uint256 m_last_block_processed; + uint256 m_last_block_processed GUARDED_BY(cs_wallet); public: /* |