[init] Get rid of some ENABLE_WALLET #8760

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:Mf1609-walletInitGuard changing 2 files +12 −16

MarcoFalke commented at 3:01 PM on September 19, 2016: member

c.f. second point of #7965
init: Get rid of some ENABLE_WALLET faddd62518
MarcoFalke added the label Refactoring on Sep 19, 2016
MarcoFalke added the label Wallet on Sep 19, 2016
laanwj approved
laanwj commented at 4:11 PM on September 19, 2016: member

nice utACK https://github.com/bitcoin/bitcoin/pull/8760/commits/faddd62518c7b81c56ea2c9936cf850878c03e0b
dcousens approved
dcousens commented at 12:40 AM on September 20, 2016: contributor

utACK

in src/init.cpp:None in faddd62518

 758 | @@ -759,10 +759,7 @@ void InitParameterInteraction()
 759 |      if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
 760 |          if (SoftSetBoolArg("-whitelistrelay", false))
 761 |              LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__);
 762 | -#ifdef ENABLE_WALLET
 763 | -        if (SoftSetBoolArg("-walletbroadcast", false))
 764 | -            LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
 765 | -#endif
 766 | +        // walletbroadcast is disabled in CWallet::ParameterInteraction()

jonasschnelli commented at 7:02 AM on September 20, 2016:

nit: I think we can remove this comment.

MarcoFalke commented at 8:20 AM on September 20, 2016:

If people agree, I will just do it in my next wallet-init pull, so I don't invalidate the existing review here.

jonasschnelli commented at 8:30 AM on September 20, 2016:

Fair enough.

laanwj commented at 10:44 AM on September 20, 2016:

I think it's fine to have this comment here. It was useful in reviewing at least, and maybe also for people that merge code that changes thes lines.

jonasschnelli approved
jonasschnelli commented at 7:02 AM on September 20, 2016: contributor

utACK
paveljanik commented at 9:01 AM on September 20, 2016: contributor

utACK https://github.com/bitcoin/bitcoin/pull/8760/commits/faddd62518c7b81c56ea2c9936cf850878c03e0b
laanwj merged this on Sep 20, 2016
laanwj closed this on Sep 20, 2016
laanwj referenced this in commit 02ac669730 on Sep 20, 2016
MarcoFalke deleted the branch on Sep 21, 2016
codablock referenced this in commit ecbcc90b20 on Sep 19, 2017
codablock referenced this in commit fbbddf8107 on Jan 11, 2018
andvgal referenced this in commit 19ff892673 on Jan 6, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#7965 Remaining instances of ENABLE_WALLET in `libbitcoin_server.a`