Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Common argument defaults for NODE_BLOOM stuff and -wallet #7509

Merged
merged 1 commit into from Feb 16, 2016

Conversation

Projects
None yet
5 participants
Member

luke-jr commented Feb 11, 2016

Can we stop adding more of these to fix? :p

Contributor

paveljanik commented Feb 11, 2016

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.

Owner

laanwj commented Feb 11, 2016

Concept ACK
-enforcenodebloom is going away soon (#6641), so I don't think it needs any fixes/improvements

Contributor

pstratem commented Feb 12, 2016

utACK 1fb91b3

Contributor

dcousens commented Feb 12, 2016

utACK 1fb91b3

Owner

laanwj commented Feb 16, 2016

@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 laanwj merged commit 1fb91b3 into bitcoin:master Feb 16, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 16, 2016

Merge #7509: Common argument defaults for NODE_BLOOM stuff and -wallet
1fb91b3 Common argument defaults for NODE_BLOOM stuff and -wallet (Luke Dashjr)

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 9, 2016

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 27, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment