Cleanup after last merge

Author: minium

src/bitcoinapi/bitcoinapi.cpp

@@ -291,7 +291,7 @@ void BitcoinAPI::importprivkey(const string& bitcoinprivkey, const string& label
 	sendcommand(command, params);
 }
 
-void BitcoinAPI::importAddress(const string& address, const string& account, bool rescan) {
+void BitcoinAPI::importaddress(const string& address, const string& account, bool rescan) {
 	string command = "importaddress";
 	Value params, result;
 	params.append(address);
@@ -427,28 +427,17 @@ double BitcoinAPI::getbalance() {
 	return result.asDouble();
 }
 
-double BitcoinAPI::getbalance(const string& account, int minconf) {
+double BitcoinAPI::getbalance(const string& account, int minconf, bool includewatchonly) {
 	string command = "getbalance";
 	Value params, result;
 	params.append(account);
 	params.append(minconf);
+	params.append(includewatchonly);
 	result = sendcommand(command, params);
 
 	return result.asDouble();
 }
 
-double BitcoinAPI::getbalance(const string& account, int minconf, bool includeWatchOnly) {
-	string command = "getbalance";
-	Value params, result;
-	params.append(account);
-	params.append(minconf);
-	params.append(includeWatchOnly);
-	result = sendcommand(command, params);
-
-	return result.asDouble();
-}
-
-
 double BitcoinAPI::getunconfirmedbalance() {
 	string command = "getunconfirmedbalance";
 	Value params, result;

src/bitcoinapi/bitcoinapi.h

@@ -25,7 +25,7 @@ class BitcoinAPI
 
 public:
     /* === Constructor and Destructor === */
-    BitcoinAPI(const std::string& user, const std::string& password, const std::string& host, int port, int httpTimeout);
+    BitcoinAPI(const std::string& user, const std::string& password, const std::string& host, int port, int httpTimeout = 50000);
     ~BitcoinAPI();
 
     /* === Auxiliary functions === */
@@ -53,7 +53,7 @@ class BitcoinAPI
     std::string dumpprivkey(const std::string& bitcoinaddress);
     void importprivkey(const std::string& bitcoinprivkey);
     void importprivkey(const std::string& bitcoinprivkey, const std::string& label, bool rescan = true);
-    void importAddress(const std::string& address, const std::string& account, bool rescan);
+    void importaddress(const std::string& address, const std::string& account, bool rescan = true);
 
     std::string addmultisigaddress(int nrequired, const std::vector<std::string>& keys);
     std::string addmultisigaddress(int nrequired, const std::vector<std::string>& keys, const std::string& account);
@@ -74,8 +74,7 @@ class BitcoinAPI
 
     /* === Accounting === */
     double getbalance();
-    double getbalance(const std::string& account, int minconf = 1);
-    double getbalance(const std::string& account, int minconf = 1, bool includeWatchOnly = false);
+    double getbalance(const std::string& account, int minconf = 1, bool includewatchonly = false);
     double getunconfirmedbalance();
 
     double getreceivedbyaccount(const std::string& account, int minconf = 1);