Auto merge of #1949 - str4d:1810-fix-disablewallet, r=str4d

Fix --disablewallet

Closes #1810.

src/Makefile.gtest.include

@@ -11,7 +11,6 @@ zcash_gtest_SOURCES = \
 	gtest/json_test_vectors.cpp \
 	gtest/json_test_vectors.h \
 	gtest/test_foundersreward.cpp \
-	gtest/test_wallet_zkeys.cpp \
 	gtest/test_jsonspirit.cpp \
 	gtest/test_tautology.cpp \
 	gtest/test_equihash.cpp \
@@ -31,7 +30,8 @@ zcash_gtest_SOURCES = \
 	gtest/test_checkblock.cpp
 if ENABLE_WALLET
 zcash_gtest_SOURCES += \
-	wallet/gtest/test_wallet.cpp
+	wallet/gtest/test_wallet.cpp \
+	wallet/gtest/test_wallet_zkeys.cpp
 endif
 
 zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC

src/gtest/test_keystore.cpp

@@ -2,7 +2,9 @@
 
 #include "keystore.h"
 #include "random.h"
+#ifdef ENABLE_WALLET
 #include "wallet/crypter.h"
+#endif
 #include "zcash/Address.hpp"
 
 TEST(keystore_tests, store_and_retrieve_spending_key) {
@@ -44,6 +46,7 @@ TEST(keystore_tests, store_and_retrieve_note_decryptor) {
     EXPECT_EQ(ZCNoteDecryption(sk.viewing_key()), decOut);
 }
 
+#ifdef ENABLE_WALLET
 class TestCCryptoKeyStore : public CCryptoKeyStore
 {
 public:
@@ -125,3 +128,4 @@ TEST(keystore_tests, store_and_retrieve_spending_key_in_encrypted_store) {
     ASSERT_EQ(1, addrs.count(addr));
     ASSERT_EQ(1, addrs.count(addr2));
 }
+#endif

src/rpcmining.cpp

@@ -401,6 +401,7 @@ static Value BIP22ValidationResult(const CValidationState& state)
     return "valid?";
 }
 
+#ifdef ENABLE_WALLET
 Value getblocktemplate(const Array& params, bool fHelp)
 {
     if (fHelp || params.size() > 1)
@@ -694,6 +695,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
 
     return result;
 }
+#endif
 
 class submitblock_StateCatcher : public CValidationInterface
 {

src/rpcserver.cpp

@@ -302,7 +302,9 @@ static const CRPCCommand vRPCCommands[] =
     { "blockchain",         "verifychain",            &verifychain,            true  },
 
     /* Mining */
+#ifdef ENABLE_WALLET
     { "mining",             "getblocktemplate",       &getblocktemplate,       true  },
+#endif
     { "mining",             "getmininginfo",          &getmininginfo,          true  },
     { "mining",             "getlocalsolps",          &getlocalsolps,          true  },
     { "mining",             "getnetworksolps",        &getnetworksolps,        true  },