diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-10-07 14:11:34 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-01-23 16:34:28 -0500 |
| commit | fadc08ad944cad42e805228cdd58e0332f4d7184 (patch) | |
| tree | f0b992bca5359762a0cc8b8cc702ee3cb8e7b9cf /src/qt | |
| parent | f5be479694d4dbaf59eef562d80fbeacb3bb7dc1 (diff) | |
| download | bitcoin-fadc08ad944cad42e805228cdd58e0332f4d7184.tar.xz | |
Locking: Lock cs_KeyStore instead of cs_wallet in legacy keyman
This commit only affects locking behavior and doesn't have other changes.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/test/wallettests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index b4cd7f6bac..b500248f78 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -145,8 +145,7 @@ void TestGUI(interfaces::Node& node) { auto spk_man = wallet->GetLegacyScriptPubKeyMan(); auto locked_chain = wallet->chain().lock(); - LOCK(wallet->cs_wallet); - AssertLockHeld(spk_man->cs_wallet); + LOCK2(wallet->cs_wallet, spk_man->cs_KeyStore); wallet->SetAddressBook(GetDestinationForKey(test.coinbaseKey.GetPubKey(), wallet->m_default_address_type), "", "receive"); spk_man->AddKeyPubKey(test.coinbaseKey, test.coinbaseKey.GetPubKey()); wallet->SetLastBlockProcessed(105, ::ChainActive().Tip()->GetBlockHash()); |