Improve -disablewallet parameter interaction #11594

pull promag wants to merge 2 commits into bitcoin:master from promag:2017-11-disable-wallet changing 1 files +13 −5

promag commented at 12:51 AM on November 2, 2017: member
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.
promag force-pushed on Nov 2, 2017
fanquake added the label Wallet on Nov 2, 2017
laanwj commented at 9:36 AM on November 6, 2017: member

utACK (though I think we need tests for this logic, it's a maze, and hard to see if anything subtly broke)

The third commit can be dropped or squashed, just took the opportunity to fix the coding style there.

Seems good to me to keep it, though a small nit: please don't call it 'fix' if it only changes coding style and doesn't fix any user issues.
promag commented at 3:42 PM on November 6, 2017: member

please don't call it 'fix' if it only changes coding style @laanwj do you mean the 2nd or 3rd commit?
MarcoFalke added the label Refactoring on Nov 7, 2017
MarcoFalke removed the label Refactoring on Nov 7, 2017
MarcoFalke commented at 6:29 PM on November 7, 2017: member

Might want to squash the last commit or drop it? No need to keep it dangling around.
Improve -disablewallet parameter interaction b411c2a12a
Fix -disablewallet default value 7963335d25
promag force-pushed on Nov 7, 2017
promag commented at 7:14 PM on November 7, 2017: member

Done.
laanwj commented at 12:31 PM on November 9, 2017: member

@laanwj do you mean the 2nd or 3rd commit?

I meant the second, but I guess it can be considered a (weak) fix changing from hardcoded false to DEFAULT_DISABLE_WALLET. Though it is a grey area as the behavior stays the same...
laanwj commented at 12:32 PM on November 9, 2017: member

utACK 7963335
laanwj merged this on Nov 9, 2017
laanwj closed this on Nov 9, 2017
laanwj referenced this in commit 0ecc6305f4 on Nov 9, 2017
TheBlueMatt commented at 6:21 PM on November 13, 2017: member

Postumous utACK 7963335d2512deea1f286d9c0b94bfaef5d9c14b
MarcoFalke commented at 6:37 PM on November 13, 2017: member

Postumous utACK 7963335
jnewbery commented at 10:58 PM on November 13, 2017: member

post-merge tested ACK https://github.com/bitcoin/bitcoin/commit/7963335d2512deea1f286d9c0b94bfaef5d9c14b
PastaPastaPasta referenced this in commit 124eef87f8 on Dec 22, 2019
PastaPastaPasta referenced this in commit 4c92f23e1d on Jan 2, 2020
PastaPastaPasta referenced this in commit 6ee59841a2 on Jan 4, 2020
PastaPastaPasta referenced this in commit 99ae1e119a on Jan 12, 2020
PastaPastaPasta referenced this in commit df29a0daaf on Jan 12, 2020
PastaPastaPasta referenced this in commit 3d280333fc on Jan 12, 2020
PastaPastaPasta referenced this in commit b72f4f52c0 on Jan 12, 2020
PastaPastaPasta referenced this in commit 34701c3ba3 on Jan 12, 2020
PastaPastaPasta referenced this in commit a7f44d2d9b on Jan 12, 2020
PastaPastaPasta referenced this in commit 6d4f8753d7 on Jan 16, 2020
PastaPastaPasta referenced this in commit 79e841fac7 on Jan 22, 2020
PastaPastaPasta referenced this in commit 710fa54d94 on Jan 29, 2020
PastaPastaPasta referenced this in commit 3ad7721217 on Jan 29, 2020
deadalnix referenced this in commit e5c7da9fd9 on Oct 29, 2020
ckti referenced this in commit 45db24e888 on Mar 28, 2021
gades referenced this in commit e63b485b64 on Jun 30, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels