From e4ef4b459548b4032b9da03b3103525f935acb82 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 12 Sep 2018 10:05:00 -0400 Subject: [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. --- src/dummywallet.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/dummywallet.cpp') diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp index 5b33daf85d..3714187a96 100644 --- a/src/dummywallet.cpp +++ b/src/dummywallet.cpp @@ -6,6 +6,8 @@ #include #include +class CWallet; + class DummyWalletInit : public WalletInitInterface { public: @@ -31,3 +33,19 @@ void DummyWalletInit::AddWalletOptions() const } const WalletInitInterface& g_wallet_init_interface = DummyWalletInit(); + +std::vector> GetWallets() +{ + throw std::logic_error("Wallet function called in non-wallet build."); +} + +namespace interfaces { + +class Wallet; + +std::unique_ptr MakeWallet(const std::shared_ptr& wallet) +{ + throw std::logic_error("Wallet function called in non-wallet build."); +} + +} // namespace interfaces -- cgit v1.2.3