diff options
| author | Antoine Riard <ariard@student.42.fr> | 2019-12-18 17:46:53 -0500 |
|---|---|---|
| committer | Antoine Riard <ariard@student.42.fr> | 2020-04-30 14:41:24 -0400 |
| commit | 6a72f26968cf931c985d8d4797b6264274cabd06 (patch) | |
| tree | 43314c9f174a36168f9c8f6f9662fcb66bb5c892 /src/qt/test | |
| parent | 841178820d31e1c24a00cb2c8fc0b1fd2f126f56 (diff) | |
| download | bitcoin-6a72f26968cf931c985d8d4797b6264274cabd06.tar.xz | |
[wallet] Remove locked_chain from CWallet, its RPCs and tests
This change is intended to make the bitcoin node and its rpc, network
and gui interfaces more responsive while the wallet is in use. Currently
because the node's cs_main mutex is always locked before the wallet's
cs_wallet mutex (to prevent deadlocks), cs_main currently stays locked
while the wallet does relatively slow things like creating and listing
transactions.
This commit only remmove chain lock tacking in wallet code, and invert
lock order from cs_main, cs_wallet to cs_wallet, cs_main.
must happen at once to avoid any deadlock. Previous commit were only
removing Chain::Lock methods to Chain interface and enforcing they
take cs_main.
Remove LockChain method from CWallet and Chain::Lock interface.
Diffstat (limited to 'src/qt/test')
| -rw-r--r-- | src/qt/test/wallettests.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 94a1e0a63d..2ee9ae0d86 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -145,7 +145,6 @@ void TestGUI(interfaces::Node& node) wallet->LoadWallet(firstRun); { auto spk_man = wallet->GetOrCreateLegacyScriptPubKeyMan(); - auto locked_chain = wallet->chain().lock(); 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()); |