getwork: fix result bool value

martexcoin · Feb 12, 2016 · b604551 · b604551
1 parent 3b06670
commit b604551
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/stratum/coind_submit.cpp b/stratum/coind_submit.cpp
@@ -9,9 +9,12 @@ bool coind_submitwork(YAAMP_COIND *coind, const char *block)
 	if(!params) return false;
 
 	sprintf(params, "[\"%s\"]", block);
-	json_value *json_res = rpc_call(&coind->rpc, "getwork", params);
+	json_value *json = rpc_call(&coind->rpc, "getwork", params);
 	free(params);
 
+	if(!json) return false;
+	json_value *json_res = json_get_object(json, "result");
+
 	bool b = json_res && json_res->type == json_boolean && json_res->u.boolean;
 	json_value_free(json_res);
 

diff --git a/stratum/json.h b/stratum/json.h
@@ -74,7 +74,7 @@ typedef struct
 
 typedef enum
 {
-   json_none,
+   json_none = 0,
    json_object,
    json_array,
    json_integer,

diff --git a/stratum/rpc.cpp b/stratum/rpc.cpp
@@ -278,10 +278,6 @@ json_value *rpc_call(YAAMP_RPC *rpc, char const *method, char const *params)
 	if(s2-s1 > 2000)
 		debuglog("delay rpc_call %s:%d %s in %d ms\n", rpc->host, rpc->port, method, s2-s1);
 
-	if (!strcmp(method, "getwork")) {
-		return json;
-	}
-
 	if(json->type != json_object)
 	{
 		json_value_free(json);

diff --git a/stratum/rpc_curl.cpp b/stratum/rpc_curl.cpp
@@ -464,6 +464,7 @@ json_value *rpc_curl_call(YAAMP_RPC *rpc, char const *method, char const *params
 		sprintf(message, "{\"method\":\"%s\",\"id\":\"%d\"}", method, ++rpc->id);
 
 	json_value *json = rpc_curl_do_call(rpc, message);
+	rpc_curl_close(rpc);
 
 	free(message);
 	if(!json) return NULL;
@@ -472,12 +473,6 @@ json_value *rpc_curl_call(YAAMP_RPC *rpc, char const *method, char const *params
 	if(s2-s1 > 2000)
 		debuglog("delay rpc_call %s:%d %s in %d ms\n", rpc->host, rpc->port, method, s2-s1);
 
-	rpc_curl_close(rpc);
-
-	if (!strcmp(method, "getwork")) {
-		return json;
-	}
-
 	if(json->type != json_object)
 	{
 		json_value_free(json);