Auto merge of #1569 - str4d:1552-disable-wallet-encryption, r=daira

Disable wallet encryption

Closes #1552

src/test/rpc_wallet_tests.cpp

@@ -1090,6 +1090,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_zkeys)
     Array arr = retValue.get_array();
     BOOST_CHECK(arr.size() == n);
 
+    // Verify that the wallet encryption RPC is disabled
+    BOOST_CHECK_THROW(CallRPC("encryptwallet passphrase"), runtime_error);
+
     // Encrypt the wallet (we can't call RPC encryptwallet as that shuts down node)
     SecureString strWalletPass;
     strWalletPass.reserve(100);