Skip to content

Common argument defaults for NODE_BLOOM stuff and -wallet #7509

New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 16, 2016
Merged

Common argument defaults for NODE_BLOOM stuff and -wallet #7509

merged 1 commit into from
Feb 16, 2016

Conversation

luke-jr
Copy link
Member

@luke-jr luke-jr commented Feb 11, 2016

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

@paveljanik
Copy link
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
Copy link
Member

laanwj commented Feb 11, 2016

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

@laanwj laanwj added the Docs label Feb 11, 2016
@pstratem
Copy link
Contributor

utACK 1fb91b3

@dcousens
Copy link
Contributor

utACK 1fb91b3

@laanwj
Copy link
Member

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
laanwj added a commit that referenced this pull request Feb 16, 2016
@laanwj
Merge #7509: Common argument defaults for NODE_BLOOM stuff and -wallet
2d4f73f 
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 27, 2016
@luke-jr
Merge bitcoin#7509 common_defaults_0.12
12a281a
codablock pushed a commit to codablock/dash that referenced this pull request Dec 11, 2017
@laanwj @codablock
Merge bitcoin#7509: Common argument defaults for NODE_BLOOM stuff and…
97c7da4 
… -wallet

1fb91b3 Common argument defaults for NODE_BLOOM stuff and -wallet (Luke Dashjr)
@codablock codablock mentioned this pull request Dec 11, 2017
Merged
@str4d str4d mentioned this pull request Dec 17, 2019
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Dec 18, 2019
@zkbot
Auto merge of #4268 - str4d:2074-cleanup-2, r=str4d
577f7ef 
Bitcoin 0.12 cleanup PRs 2

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6631
- bitcoin/bitcoin#6664
  - Only the first commit (we already had the second through bitcoin/bitcoin#6825).
- bitcoin/bitcoin#6669
- bitcoin/bitcoin#6887
  - Only the non-QT parts.
- bitcoin/bitcoin#6962
- bitcoin/bitcoin#6822
  - Only first and third commits (we already had the second through an earlier PR).
- bitcoin/bitcoin#7136
  - Excludes Travis CI changes, and fixes to documents we don't have anymore.
- bitcoin/bitcoin#7084
- bitcoin/bitcoin#7509
- bitcoin/bitcoin#7617
- bitcoin/bitcoin#7726

Part of #2074.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Docs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@luke-jr @paveljanik @laanwj @pstratem @dcousens