[Wallet] move wallet help string creation to CWallet #7576

pull jonasschnelli wants to merge 1 commits into bitcoin:master from jonasschnelli:2016/02/wallet_helpstr changing 3 files +43 −30

jonasschnelli commented at 10:01 AM on February 22, 2016: contributor

Simple and easy-to-review refactoring to reduce wallets init.cpp polution and sets another step in the wallet separation / duplication.

The only visible change to users would be, that the wallet help message part has now it's own -help-debug part (IMO desirable if we look at the wallet as it is a module)
jonasschnelli added the label Refactoring on Feb 22, 2016
jonasschnelli added the label Wallet on Feb 22, 2016
paveljanik commented at 4:58 PM on February 22, 2016: contributor

ACK (please fix the typo).
kirkalx commented at 10:09 PM on February 22, 2016: contributor

Nice, utACK.
MarcoFalke commented at 3:25 PM on February 26, 2016: member

Looks good. utACK acf7f87
in src/wallet/wallet.h:None in acf7f87598 outdated
```
  54 | @@ -55,6 +55,8 @@ static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
  55 |  static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
  56 |  static const bool DEFAULT_WALLETBROADCAST = true;
  57 |  
  58 | +static const char * const DEFAULT_WALLET_DAT = "wallet.dat";
```
laanwj commented at 5:19 PM on March 1, 2016:

Better not to put string constants in header files. This causes problems, such as duplication - either undetected and wasting space in the executable, or explicit linker duplication errors.

Better to make it "extern const char*" and define the value in the implementation file.
laanwj commented at 5:21 PM on March 1, 2016: member

utACK apart from nit - great idea.
sipa commented at 5:22 AM on March 5, 2016: member

Concept ACK, but fix @laanwj's nit and the typo.

in src/wallet/wallet.h:None in acf7f87598 outdated

 870 | @@ -869,6 +871,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 871 |  
 872 |      /* Mark a transaction (and it in-wallet descendants) as abandoned so its inputs may be respent. */
 873 |      bool AbandonTransaction(const uint256& hashTx);
 874 | +
 875 | +    /* Retruns the wallets help message */

MarcoFalke commented at 5:02 PM on March 5, 2016:

@jonasschnelli Please address the feedback so this can be merged next week.

jonasschnelli commented at 5:33 PM on March 5, 2016:

Yes. Will fix is in the next coupl of hours. Thanks for the reminder.

jonasschnelli force-pushed on Mar 5, 2016
[Wallet] move wallet help string creation to CWallet 72c2651581
jonasschnelli force-pushed on Mar 5, 2016
jonasschnelli commented at 6:27 PM on March 5, 2016: contributor

Fixed nit (amend force push)
MarcoFalke commented at 7:46 PM on March 5, 2016: member

utACK 72c2651
laanwj merged this on Mar 11, 2016
laanwj closed this on Mar 11, 2016
laanwj referenced this in commit 86a1ec5b2c on Mar 11, 2016
codablock referenced this in commit 951c200399 on Sep 16, 2017
codablock referenced this in commit 2c0c1fcbdf on Sep 19, 2017
codablock referenced this in commit d0e5d2baee on Dec 9, 2017
codablock referenced this in commit 51c6ab20f3 on Dec 19, 2017
zkbot referenced this in commit fa341bcff0 on Dec 18, 2019
random-zebra referenced this in commit e89e20eca1 on Aug 25, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels