Skip to content

Commit

Permalink
Add missed thread safety annotations
Browse files Browse the repository at this point in the history
This is needed for upcoming commit "sync.h: Make runtime lock checks
require compile-time lock checks" to pass.
  • Loading branch information
hebasto committed Aug 29, 2020
1 parent af9ea55 commit 3ddc150
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/wallet/scriptpubkeyman.h
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
//! keeps track of whether Unlock has run a thorough check before
bool m_decryption_thoroughly_checked = false;

bool AddDescriptorKeyWithDB(WalletBatch& batch, const CKey& key, const CPubKey &pubkey);
bool AddDescriptorKeyWithDB(WalletBatch& batch, const CKey& key, const CPubKey &pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);

KeyMap GetKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);

Expand Down
2 changes: 1 addition & 1 deletion src/wallet/wallet.h
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
void LoadActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal);

//! Create new DescriptorScriptPubKeyMans and add them to the wallet
void SetupDescriptorScriptPubKeyMans();
void SetupDescriptorScriptPubKeyMans() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);

//! Return the DescriptorScriptPubKeyMan for a WalletDescriptor if it is already in the wallet
DescriptorScriptPubKeyMan* GetDescriptorScriptPubKeyMan(const WalletDescriptor& desc) const;
Expand Down

0 comments on commit 3ddc150

Please sign in to comment.