diff options
| author | James O'Beirne <james.obeirne@pm.me> | 2020-01-29 09:57:56 -0500 |
|---|---|---|
| committer | James O'Beirne <james.obeirne@pm.me> | 2020-03-17 14:07:58 -0400 |
| commit | c9017ce3bc27665594c9d80f395780d40755bb22 (patch) | |
| tree | 36ea710a14db1757ed270ff6e8585eb53427e74f /src/wallet/test/wallet_tests.cpp | |
| parent | 2b081c4568e8019886fdb0f2a57babc73d7487f7 (diff) | |
| download | bitcoin-c9017ce3bc27665594c9d80f395780d40755bb22.tar.xz | |
protect g_chainman with cs_main
I'd previously attempted to create a specialized lock for ChainstateManager,
but it turns out that because that lock would be required for functions like
ChainActive() and ChainstateActive(), it created irreconcilable lock inversions
since those functions are used so broadly throughout the codebase.
Instead, I'm just using cs_main to protect the contents of g_chainman.
Co-authored-by: Russell Yanofsky <russ@yanofsky.org>
Diffstat (limited to 'src/wallet/test/wallet_tests.cpp')
| -rw-r--r-- | src/wallet/test/wallet_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index a487e9e2e0..13e10c1eab 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -454,7 +454,7 @@ public: CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); wallet = MakeUnique<CWallet>(m_chain.get(), WalletLocation(), WalletDatabase::CreateMock()); { - LOCK(wallet->cs_wallet); + LOCK2(::cs_main, wallet->cs_wallet); wallet->SetLastBlockProcessed(::ChainActive().Height(), ::ChainActive().Tip()->GetBlockHash()); } bool firstRun; |