Common argument defaults for NODE_BLOOM stuff and -wallet #7509

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:common_defaults_0.12 changing 3 files +11 −6

luke-jr commented at 6:38 AM on February 11, 2016: member

Can we stop adding more of these to fix? :p
Common argument defaults for NODE_BLOOM stuff and -wallet 1fb91b3496

paveljanik commented at 7:05 AM on February 11, 2016: contributor

When you are at this...

These:

init.cpp:    strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet.dat on startup"));
init.cpp:                uiInterface.InitMessage(_("Error loading wallet.dat: Wallet corrupted"));
init.cpp:                strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
init.cpp:                InitWarning(_("Error reading wallet.dat! All keys read correctly, but transaction data"
init.cpp:                strErrors << strprintf(_("Error loading wallet.dat: Wallet requires newer version of %s"), _(PACKAGE_NAME)) << "\n";
init.cpp:                strErrors << _("Error loading wallet.dat") << "\n";

should probably use the selected wallet.dat file name (strWalletFile) instead of the hardcoded name. And there are other such cases.

laanwj commented at 8:02 AM on February 11, 2016: member

Concept ACK -enforcenodebloom is going away soon (#6641), so I don't think it needs any fixes/improvements
laanwj added the label Docs and Output on Feb 11, 2016
pstratem commented at 12:58 AM on February 12, 2016: contributor

utACK 1fb91b3496f2f07bbace1f9f8e716f7f62d889e6
dcousens commented at 3:36 AM on February 12, 2016: contributor

utACK 1fb91b3
laanwj commented at 9:00 AM on February 16, 2016: member

@paveljanik I think the -salvagewallet help message should simply say 'wallet', not 'wallet.dat'. For the warnings and errors you're right and it'd be better to use the actual wallet file name.
laanwj merged this on Feb 16, 2016
laanwj closed this on Feb 16, 2016
laanwj referenced this in commit 2d4f73f47e on Feb 16, 2016
luke-jr referenced this in commit ceb68ace62 on Jun 9, 2016
luke-jr referenced this in commit d90c409398 on Jun 27, 2016
luke-jr referenced this in commit 12a281acdc on Jun 27, 2016
codablock referenced this in commit 97c7da4b7a on Dec 11, 2017
zkbot referenced this in commit 8713d73daf on Dec 18, 2019
zkbot referenced this in commit 2da77edbfe on Dec 18, 2019
zkbot referenced this in commit 577f7ef72a on Dec 18, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels