[build] remove ENABLE_WALLET ifdef from httprpc.cpp

jnewbery · jnewbery · commit 7d038dcb41d9 · 2018-09-10T14:27:32.000-04:00
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
@@ -9,6 +9,7 @@
 class DummyWalletInit : public WalletInitInterface {
 public:
 
+    bool HasWalletSupport() const override {return false;}
     void AddWalletOptions() const override;
     bool ParameterInteraction() const override {return true;}
     void RegisterRPC(CRPCTable &) const override {}
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
@@ -14,6 +14,7 @@
 #include <util.h>
 #include <utilstrencodings.h>
 #include <ui_interface.h>
+#include <walletinitinterface.h>
 #include <crypto/hmac_sha256.h>
 #include <stdio.h>
 
@@ -240,10 +241,9 @@ bool StartHTTPRPC()
         return false;
 
     RegisterHTTPHandler("/", true, HTTPReq_JSONRPC);
-#ifdef ENABLE_WALLET
-    // ifdef can be removed once we switch to better endpoint support and API versioning
-    RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
-#endif
+    if (g_wallet_init_interface.HasWalletSupport()) {
+        RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
+    }
     struct event_base* eventBase = EventBase();
     assert(eventBase);
     httpRPCTimerInterface = MakeUnique<HTTPRPCTimerInterface>(eventBase);
@@ -260,9 +260,9 @@ void StopHTTPRPC()
 {
     LogPrint(BCLog::RPC, "Stopping HTTP RPC server\n");
     UnregisterHTTPHandler("/", true);
-#ifdef ENABLE_WALLET
-    UnregisterHTTPHandler("/wallet/", false);
-#endif
+    if (g_wallet_init_interface.HasWalletSupport()) {
+        UnregisterHTTPHandler("/wallet/", false);
+    }
     if (httpRPCTimerInterface) {
         RPCUnsetTimerInterface(httpRPCTimerInterface.get());
         httpRPCTimerInterface.reset();
diff --git a/src/init.h b/src/init.h
@@ -13,9 +13,6 @@
 class CScheduler;
 class CWallet;
 
-class WalletInitInterface;
-extern const WalletInitInterface& g_wallet_init_interface;
-
 namespace boost
 {
 class thread_group;
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -19,6 +19,9 @@
 class WalletInit : public WalletInitInterface {
 public:
 
+    //! Was the wallet component compiled in.
+    bool HasWalletSupport() const override {return true;}
+
     //! Return the wallets help message.
     void AddWalletOptions() const override;
 
diff --git a/src/walletinitinterface.h b/src/walletinitinterface.h
@@ -12,6 +12,8 @@ class CRPCTable;
 
 class WalletInitInterface {
 public:
+    /** Is the wallet component enabled */
+    virtual bool HasWalletSupport() const = 0;
     /** Get wallet help string */
     virtual void AddWalletOptions() const = 0;
     /** Check wallet parameter interaction */
@@ -34,4 +36,6 @@ class WalletInitInterface {
     virtual ~WalletInitInterface() {}
 };
 
+extern const WalletInitInterface& g_wallet_init_interface;
+
 #endif // BITCOIN_WALLETINITINTERFACE_H

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`	`class CScheduler;`
`14`	`14`	`class CWallet;`
`15`	`15`
`16`		`-class WalletInitInterface;`
`17`		`-extern const WalletInitInterface& g_wallet_init_interface;`
`18`		`-`
`19`	`16`	`namespace boost`
`20`	`17`	`{`
`21`	`18`	`class thread_group;`