init: Get rid of fDisableWallet #8768

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1609-initDisableWallet changing 5 files +27 −22

MarcoFalke commented at 3:32 PM on September 20, 2016: member

This moves the disablewallet logic from init.cpp to wallet.cpp

C.f. #7965
init: Get rid of fDisableWallet fab91070d3
MarcoFalke added the label Refactoring on Sep 20, 2016
MarcoFalke added the label Wallet on Sep 20, 2016
in src/wallet/wallet.cpp:None in fab91070d3 outdated
```
3295 | @@ -3293,6 +3296,12 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
3296 |  
3297 |  bool CWallet::InitLoadWallet()
3298 |  {
3299 | +    if (GetBoolArg("-disablewallet", false)) {
```
laanwj commented at 3:35 PM on September 20, 2016:

I wonder why we don't have a constant DEFAULT_DISABLEWALLET like for the other args.

MarcoFalke commented at 3:39 PM on September 20, 2016:

Maybe some constants are too obvious to have a default value. In the future this might change for -disablewallet and we should introduce the default value.

laanwj commented at 8:55 AM on September 21, 2016:

But for consistency it'd make sense to have one. When changing the default it's easy enough to forget one of the GetArgs().
laanwj commented at 3:35 PM on September 20, 2016: member

Concept ACK
jonasschnelli approved
jonasschnelli commented at 6:37 PM on September 20, 2016: contributor

https://github.com/bitcoin/bitcoin/pull/8768/commits/fab91070d38aa248a852e04c56dcb73e4022872d
jonasschnelli approved
jonasschnelli commented at 6:37 PM on September 20, 2016: contributor

utACK https://github.com/bitcoin/bitcoin/pull/8768/commits/fab91070d38aa248a852e04c56dcb73e4022872d
dcousens approved
[wallet] Introduce DEFAULT_DISABLE_WALLET fa58edbffe
laanwj approved
laanwj commented at 10:26 AM on September 21, 2016: member

Perfect, utACK https://github.com/bitcoin/bitcoin/pull/8768/commits/fa58edbffe929da45004d4406d7d1ffc7d14dc98
laanwj merged this on Sep 21, 2016
laanwj closed this on Sep 21, 2016
laanwj referenced this in commit 886e8c9b72 on Sep 21, 2016
codablock referenced this in commit fe315ec008 on Sep 19, 2017
codablock referenced this in commit 06f41f3586 on Jan 11, 2018
andvgal referenced this in commit c374eba9ec on Jan 6, 2019
random-zebra referenced this in commit 6fc3498286 on May 11, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#7965 Remaining instances of ENABLE_WALLET in `libbitcoin_server.a`