[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: memberAdds a couple of redefinitions to dummywallet.cpp.
-
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, 2018jnewbery commented at 4:45 pm on September 12, 2018: memberMarcoFalke commented at 4:53 pm on September 12, 2018: memberutACK 3efef4b225308954b23a30c74d7781ba87a51b76scravy approvedscravy commented at 4:54 pm on September 12, 2018: contributorutACK 3efef4b225308954b23a30c74d7781ba87a51b76ryanofsky commented at 5:12 pm on September 12, 2018: memberutACK 3efef4b225308954b23a30c74d7781ba87a51b76in 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:fixedfanquake added the label Build system on Sep 12, 2018[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.
jnewbery force-pushed on Sep 13, 2018jnewbery commented at 1:38 pm on September 13, 2018: memberI’ve addressed the comment in #14208 (review) and force-pushed.promag commented at 1:48 pm on September 13, 2018: memberutACK e4ef4b4.laanwj merged this on Sep 13, 2018laanwj closed this on Sep 13, 2018
laanwj referenced this in commit 49fd485bbf on Sep 13, 2018deadalnix referenced this in commit 481ac5a90d on Mar 20, 2020ftrader referenced this in commit fba296ce9b on May 19, 20205tefan referenced this in commit 8a26884469 on Aug 10, 20215tefan referenced this in commit 6854734739 on Aug 11, 20215tefan referenced this in commit 07dd0f6909 on Aug 12, 20215tefan referenced this in commit 33c18437c9 on Aug 12, 20215tefan referenced this in commit 1cea09e753 on Aug 12, 2021UdjinM6 referenced this in commit 297cdf92b5 on Aug 13, 2021MarcoFalke 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-11-17 06:12 UTC
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-11-17 06:12 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me
More mirrored repositories can be found on mirror.b10c.me