diff options
| author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2020-08-21 01:06:53 +0100 |
|---|---|---|
| committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2020-08-28 10:42:18 +0100 |
| commit | 772ea4844c34ad70d02fd0bd6c0945baa8fff85c (patch) | |
| tree | f18ec2a84a55540cf920847ffddc04d29b54f69d /src/wallet/wallet.h | |
| parent | 819f10f6718659eeeec13af2ce831df3a0984090 (diff) | |
| download | bitcoin-772ea4844c34ad70d02fd0bd6c0945baa8fff85c.tar.xz | |
wallet: Avoid recursive lock in IsTrusted
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 bd54af7782..ebd2e91492 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -502,7 +502,6 @@ public: bool InMempool() const; bool IsTrusted() const; - bool IsTrusted(std::set<uint256>& trusted_parents) const; int64_t GetTxTime() const; @@ -806,6 +805,7 @@ public: interfaces::Chain& chain() const { assert(m_chain); return *m_chain; } const CWalletTx* GetWalletTx(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); + bool IsTrusted(const CWalletTx& wtx, std::set<uint256>& trusted_parents) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); //! check whether we are allowed to upgrade (or already support) to the named feature bool CanSupportFeature(enum WalletFeature wf) const override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet) { AssertLockHeld(cs_wallet); return nWalletMaxVersion >= wf; } |