[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
  1. jnewbery commented at 2:09 pm on September 12, 2018: member
    Adds a couple of redefinitions to dummywallet.cpp.
  2. jnewbery commented at 2:09 pm on September 12, 2018: member
    Builds on #14204. Review that first.
  3. laanwj commented at 2:40 pm on September 12, 2018: member
    utACK abdba5f59e348c7093bee2639ef6c2398e8d2f6c (really closes #7965)
  4. 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!
  5. jnewbery force-pushed on Sep 12, 2018
  6. 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)
  7. MarcoFalke commented at 4:53 pm on September 12, 2018: member
    utACK 3efef4b225308954b23a30c74d7781ba87a51b76
  8. scravy approved
  9. scravy commented at 4:54 pm on September 12, 2018: contributor
    utACK 3efef4b225308954b23a30c74d7781ba87a51b76
  10. ryanofsky commented at 5:12 pm on September 12, 2018: member
    utACK 3efef4b225308954b23a30c74d7781ba87a51b76
  11. 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:
    02018-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]
    12018-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
  12. fanquake added the label Build system on Sep 12, 2018
  13. DrahtBot commented at 0:22 am on September 13, 2018: member
    • #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.

  14. [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
  15. jnewbery force-pushed on Sep 13, 2018
  16. jnewbery commented at 1:38 pm on September 13, 2018: member
    I’ve addressed the comment in #14208 (review) and force-pushed.
  17. promag commented at 1:48 pm on September 13, 2018: member
    utACK e4ef4b4.
  18. laanwj merged this on Sep 13, 2018
  19. laanwj closed this on Sep 13, 2018

  20. laanwj referenced this in commit 49fd485bbf on Sep 13, 2018
  21. deadalnix referenced this in commit 481ac5a90d on Mar 20, 2020
  22. ftrader referenced this in commit fba296ce9b on May 19, 2020
  23. 5tefan referenced this in commit 8a26884469 on Aug 10, 2021
  24. 5tefan referenced this in commit 6854734739 on Aug 11, 2021
  25. 5tefan referenced this in commit 07dd0f6909 on Aug 12, 2021
  26. 5tefan referenced this in commit 33c18437c9 on Aug 12, 2021
  27. 5tefan referenced this in commit 1cea09e753 on Aug 12, 2021
  28. UdjinM6 referenced this in commit 297cdf92b5 on Aug 13, 2021
  29. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-18 15:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me