Merge branch 'xloem-persistent-connection'

Author: minium

src/bitcoinapi/bitcoinapi.cpp

@@ -30,20 +30,17 @@ using std::string;
 using std::vector;
 
 
-BitcoinAPI::BitcoinAPI(){
-	conn = {};
+BitcoinAPI::BitcoinAPI(const string& user, const string& password, const string& host, int port)
+: httpClient(new HttpClient("http://" + user + ":" + password + "@" + host + ":" + NumberToString(port))),
+  client(new Client(*httpClient, JSONRPC_CLIENT_V1))
+{
+    httpClient->SetTimeout(20000);
 }
 
-BitcoinAPI::BitcoinAPI(const string& user, const string& password, const string& host, int port){
-	conn.user = user;
-	conn.password = password;
-	conn.host = host;
-	conn.port = port;
-	conn.url = "http://" + conn.user + ":" + conn.password + "@" + conn.host + ":" + NumberToString(conn.port);
-}
-
-bool BitcoinAPI::IsInit(){
-	return !(conn.user.empty() || conn.password.empty() || conn.host.empty() || conn.port == 0);
+BitcoinAPI::~BitcoinAPI()
+{
+    delete client;
+    delete httpClient;
 }
 
 string BitcoinAPI::NumberToString (int number){
@@ -59,14 +56,10 @@ int BitcoinAPI::StringToNumber (const string &text){
 }
 
 Value BitcoinAPI::sendcommand(const string& command, const Value& params){    
-    HttpClient client(conn.url);
-    client.SetTimeout(20000);
-
-    Client c(client, JSONRPC_CLIENT_V1);
     Value result;
 
     try{
-		result = c.CallMethod(command, params);
+		result = client->CallMethod(command, params);
 	}
 	catch (JsonRpcException& e){
 		BitcoinException err(e.GetCode(), e.GetMessage());

src/bitcoinapi/bitcoinapi.h

@@ -14,26 +14,19 @@
 #include "types.h"
 #include "exception.h"
 
+namespace jsonrpc { class HttpClient; class Client; }
 
 class BitcoinAPI
 {
 
 private:
-    struct connection
-    {
-	    std::string url;
-	    std::string user;
-	    std::string password;
-	    std::string host;
-	    int port;
-    } conn;
+    jsonrpc::HttpClient * httpClient;
+    jsonrpc::Client * client;
 
 public:
-    /* === Constructors === */
-    BitcoinAPI();
+    /* === Constructor and Destructor === */
     BitcoinAPI(const std::string& user, const std::string& password, const std::string& host, int port);
-
-    bool IsInit();
+    ~BitcoinAPI();
 
     /* === Auxiliary functions === */
     Json::Value sendcommand(const std::string& command, const Json::Value& params);

src/test/main.cpp

@@ -16,13 +16,13 @@ struct MyFixture {
 
 	BitcoinAPI btc;
 
-     MyFixture() {
-    	 username = "Ulysses";
-    	 password = "Random";
-    	 address = "127.0.0.1";
-    	 port = 8332;
-    	 btc = BitcoinAPI(username, password, address, port);
-     }
+     MyFixture()
+     : username("Ulysses"),
+       password("Random"),
+       address("127.0.0.1"),
+       port(8332),
+       btc(username, password, address, port)
+     { }
      ~MyFixture() { }
 };