[build] Actually remove ENABLE_WALLET #14208

pull jnewbery wants to merge 1 commits into bitcoin:master from jnewbery:actually_remove_enabled_wallet changing 3 files +27 −15

jnewbery commented at 2:09 PM on September 12, 2018: member

Adds a couple of redefinitions to dummywallet.cpp.
jnewbery commented at 2:09 PM on September 12, 2018: member

Builds on #14204. Review that first.
laanwj commented at 2:40 PM on September 12, 2018: member

utACK abdba5f59e348c7093bee2639ef6c2398e8d2f6c (really closes #7965)

in src/interfaces/node.cpp:223 in abdba5f59e outdated

 218 | @@ -221,15 +219,15 @@ class NodeImpl : public Node
 219 |      }
 220 |      std::vector<std::unique_ptr<Wallet>> getWallets() override
 221 |      {
 222 | -#ifdef ENABLE_WALLET
 223 | +        if (!g_wallet_init_interface.HasWalletSupport()) {
 224 | +            throw std::logic_error("Node::getWallets() called in non-wallet build.");

ryanofsky commented at 3:00 PM on September 12, 2018:

Can you drop g_wallet_init_interface references and throws in this file? They seem redundant if MakeWallet and GetWallets functions can throw now.

jnewbery commented at 4:45 PM on September 12, 2018:

Done!

jnewbery force-pushed on Sep 12, 2018
jnewbery commented at 4:45 PM on September 12, 2018: member

#14204 is merged. I've rebased on master and addresed @ryanofsky's feedback: #14208 (review)
MarcoFalke commented at 4:53 PM on September 12, 2018: member

utACK 3efef4b225308954b23a30c74d7781ba87a51b76
scravy approved
scravy commented at 4:54 PM on September 12, 2018: contributor

utACK 3efef4b225308954b23a30c74d7781ba87a51b76
ryanofsky commented at 5:12 PM on September 12, 2018: member

utACK 3efef4b225308954b23a30c74d7781ba87a51b76

in src/interfaces/node.cpp:41 in 3efef4b225 outdated

  43 |  #include <atomic>
  44 |  #include <boost/thread/thread.hpp>
  45 |  #include <univalue.h>
  46 |  
  47 | +class CWallet;
  48 | +class Wallet;

practicalswift commented at 9:50 PM on September 12, 2018:

2018-09-12 23:23:50 clang-tidy(pr=14208): interfaces/node.cpp:41:7: warning: declaration 'Wallet' is never referenced, but a declaration with the same name found in another namespace 'interfaces' [bugprone-forward-declaration-namespace]
2018-09-12 23:23:50 clang-tidy(pr=14208): interfaces/node.cpp:41:7: warning: no definition found for 'Wallet', but a definition with the same name 'Wallet' found in another namespace 'interfaces' [bugprone-forward-declaration-namespace]

promag commented at 9:05 AM on September 13, 2018:

Yap, should be fixed.

jnewbery commented at 1:37 PM on September 13, 2018:

fixed

fanquake added the label Build system on Sep 12, 2018
DrahtBot commented at 12:22 AM on September 13, 2018: member
Note to reviewers: This pull request conflicts with the following ones:
- #10973 (Refactor: separate wallet from node by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

[build] remove #ifdef ENABLE_WALLET from interfaces/node

Removes the final #ifdef ENABLE_WALLET from libbitcoin_server by calling
g_wallet_init_interface.HasWalletSupport(), and redifining GetWallets()
and MakeWallet() in dummywallet.cpp.

e4ef4b4595

jnewbery force-pushed on Sep 13, 2018
jnewbery commented at 1:38 PM on September 13, 2018: member

I've addressed the comment in #14208 (review) and force-pushed.
promag commented at 1:48 PM on September 13, 2018: member

utACK e4ef4b4.
laanwj merged this on Sep 13, 2018
laanwj closed this on Sep 13, 2018
laanwj referenced this in commit 49fd485bbf on Sep 13, 2018
deadalnix referenced this in commit 481ac5a90d on Mar 20, 2020
ftrader referenced this in commit fba296ce9b on May 19, 2020
5tefan referenced this in commit 8a26884469 on Aug 10, 2021
5tefan referenced this in commit 6854734739 on Aug 11, 2021
5tefan referenced this in commit 07dd0f6909 on Aug 12, 2021
5tefan referenced this in commit 33c18437c9 on Aug 12, 2021
5tefan referenced this in commit 1cea09e753 on Aug 12, 2021
UdjinM6 referenced this in commit 297cdf92b5 on Aug 13, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels