diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-09 13:31:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-09 13:32:35 +0100 |
| commit | 0ecc6305f464ff998f580c9ebd616ab42b4160bf (patch) | |
| tree | 8556006adce4f9010fdc5e0e99e62a2522ac6d6b /src/qt/paymentserver.cpp | |
| parent | 331352f99f2369895be8e06696714d411c471a94 (diff) | |
| parent | 7963335d2512deea1f286d9c0b94bfaef5d9c14b (diff) | |
| download | bitcoin-0ecc6305f464ff998f580c9ebd616ab42b4160bf.tar.xz | |
Merge #11594: Improve -disablewallet parameter interaction
7963335 Fix -disablewallet default value (João Barbosa)
b411c2a Improve -disablewallet parameter interaction (João Barbosa)
Pull request description:
The first commit logs a message for each configured wallet if `-disablewallet` is set:
```
bitcoind -printtoconsole -regtest -disablewallet -wallet=foo -wallet=bar
...
WalletParameterInteraction: parameter interaction: -disablewallet -> ignoring -wallet=foo
WalletParameterInteraction: parameter interaction: -disablewallet -> ignoring -wallet=bar
```
It also moves up the `-disablewallet` check which avoids the unnecessary `-wallet` soft set.
The second commit fixes the default value of `-disablewallet`, currently the value is correct, but it should use `DEFAULT_DISABLE_WALLET`.
The third commit can be dropped or squashed, just took the opportunity to fix the coding style there.
Tree-SHA512: bec13d2b2be5adf4680c77212020ed27dd05f15c4c73542d2005d91108bf704e2df1707ed2bec696e584ecd40eff7a63e25201fd70400222aa5a8da6aed6afeb
Diffstat (limited to 'src/qt/paymentserver.cpp')
0 files changed, 0 insertions, 0 deletions