make BlockUntilSyncedToCurrentChain() const

kallewoof · kallewoof · commit dc2d0650fdb6 · 2020-03-02T17:26:30.000+09:00
The method checks the chain tip for the best block, and calls SyncWithValidationInterfaceQueue() (a standalone function) if necessary.
diff --git a/src/index/base.cpp b/src/index/base.cpp
@@ -270,7 +270,7 @@ void BaseIndex::ChainStateFlushed(const CBlockLocator& locator)
     Commit();
 }
 
-bool BaseIndex::BlockUntilSyncedToCurrentChain()
+bool BaseIndex::BlockUntilSyncedToCurrentChain() const
 {
     AssertLockNotHeld(cs_main);
 
diff --git a/src/index/base.h b/src/index/base.h
@@ -97,7 +97,7 @@ class BaseIndex : public CValidationInterface
     /// sync once and only needs to process blocks in the ValidationInterface
     /// queue. If the index is catching up from far behind, this method does
     /// not block and immediately returns false.
-    bool BlockUntilSyncedToCurrentChain();
+    bool BlockUntilSyncedToCurrentChain() const;
 
     void Interrupt();
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1150,7 +1150,7 @@ void CWallet::UpdatedBlockTip()
 }
 
 
-void CWallet::BlockUntilSyncedToCurrentChain() {
+void CWallet::BlockUntilSyncedToCurrentChain() const {
     AssertLockNotHeld(cs_wallet);
     // Skip the queue-draining stuff if we know we're caught up with
     // ::ChainActive().Tip(), otherwise put a callback in the validation interface queue and wait
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1112,7 +1112,7 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
      * Obviously holding cs_main/cs_wallet when going into this call may cause
      * deadlock
      */
-    void BlockUntilSyncedToCurrentChain() LOCKS_EXCLUDED(cs_main, cs_wallet);
+    void BlockUntilSyncedToCurrentChain() const LOCKS_EXCLUDED(cs_main, cs_wallet);
 
     /** set a single wallet flag */
     void SetWalletFlag(uint64_t flags);

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ void BaseIndex::ChainStateFlushed(const CBlockLocator& locator)`
`270`	`270`	`Commit();`
`271`	`271`	`}`
`272`	`272`
`273`		`-bool BaseIndex::BlockUntilSyncedToCurrentChain()`
	`273`	`+bool BaseIndex::BlockUntilSyncedToCurrentChain() const`
`274`	`274`	`{`
`275`	`275`	`AssertLockNotHeld(cs_main);`
`276`	`276`
Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ void CWallet::UpdatedBlockTip()`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`	`1152`
`1153`		`-void CWallet::BlockUntilSyncedToCurrentChain() {`
	`1153`	`+void CWallet::BlockUntilSyncedToCurrentChain() const {`
`1154`	`1154`	`AssertLockNotHeld(cs_wallet);`
`1155`	`1155`	`// Skip the queue-draining stuff if we know we're caught up with`
`1156`	`1156`	`// ::ChainActive().Tip(), otherwise put a callback in the validation interface queue and wait`