diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-09-03 18:24:23 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-09-03 18:24:32 +0200 |
| commit | a0a422c34cfd6514d0cc445bd784d3ee1a2d1749 (patch) | |
| tree | 75eeca979b74c28af06eec94d0986a3f00626339 /src/qt/test/addressbooktests.cpp | |
| parent | bd60a9a8edd4a3fe2f4f605b77cdae34969eaaf2 (diff) | |
| parent | f1ee37319a7a211e5fb325406d62db5b61dbd30e (diff) | |
Merge #19754: wallet, gui: Reload previously loaded wallets on startup
f1ee37319a7a211e5fb325406d62db5b61dbd30e wallet: Reload previously loaded wallets on GUI startup (Andrew Chow)
Pull request description:
Enable the GUI to also use the load_on_startup feature. Wallets loaded in the GUI always have load_on_startup=true. When they are unloaded from the GUI, load_on_startup=false.
To facilitate this change, UpdateWalletSetting is moved into the wallet module and called from within LoadWallet, RemoveWallet, and Createwallet. This change does not actually touch the GUI code but rather the wallet functions that are shared between the GUI and RPC.
ACKs for top commit:
jonasschnelli:
Tested ACK f1ee37319a7a211e5fb325406d62db5b61dbd30e - works as expected. Wallets loaded via bitcoin-cli (in `-server` mode) or through the RPC console won't be loaded on startup but wallets loaded via the GUI menu will.
kristapsk:
ACK f1ee37319a7a211e5fb325406d62db5b61dbd30e, I have tested the code.
Tree-SHA512: f5b44aa763cf761d919015c5fbc0600b72434aa71e3b57007fd7530a29c3da1a9a0c98c4f22cb6cdffba61150a31170056a7d4737625e7b76f6958f3d584da8c
Diffstat (limited to 'src/qt/test/addressbooktests.cpp')
| -rw-r--r-- | src/qt/test/addressbooktests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index 84f981dff3..d6781460a7 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -112,7 +112,7 @@ void TestAddAddressesToSendBook(interfaces::Node& node) ClientModel clientModel(node, &optionsModel); AddWallet(wallet); WalletModel walletModel(interfaces::MakeWallet(wallet), clientModel, platformStyle.get()); - RemoveWallet(wallet); + RemoveWallet(wallet, nullopt); EditAddressDialog editAddressDialog(EditAddressDialog::NewSendingAddress); editAddressDialog.setModel(walletModel.getAddressTableModel()); |