GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add request method name to the result to allow matching onthe client side (#987)

Browse Source 
* add request method name to the result to allow matching onthe client side

* update tests for change in rpc response api
This commit is contained in:
Blade Doyle
2018-04-23 01:41:35 -07:00
committed by Yeastplume
parent 03fa9f491d
commit 86d7628562
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/src/mining/stratumserver.rs
+3
View File
@@ -53,6 +53,7 @@ struct RpcRequest {
struct RpcResponse {
id: String,
jsonrpc: String,
method: String,
result: Option<String>,
error: Option<RpcError>,
}
@@ -329,6 +330,7 @@ impl StratumServer {
let resp = RpcResponse {
id: workers_l[num].id.clone(),
jsonrpc: String::from("2.0"),
method: request.method,
result: None,
error: Some(rpc_err),
};
@@ -337,6 +339,7 @@ impl StratumServer {
let resp = RpcResponse {
id: workers_l[num].id.clone(),
jsonrpc: String::from("2.0"),
method: request.method,
result: Some(response),
error: None,
};
servers/tests/stratum.rs
+2 -2
View File
@@ -117,7 +117,7 @@ fn basic_stratum_server() {
// keepalive - expected "ok" result
let mut response = String::new();
let job_req = "{\"id\":\"3\",\"jsonrpc\":\"2.0\",\"method\":\"keepalive\"}\n";
let ok_resp = "{\"id\":\"3\",\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"error\":null}\n";
let ok_resp = "{\"id\":\"3\",\"jsonrpc\":\"2.0\",\"method\":\"keepalive\",\"result\":\"ok\",\"error\":null}\n";
workers[2].write(job_req.as_bytes()).unwrap();
workers[2].flush().unwrap();
thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply
@@ -127,7 +127,7 @@ fn basic_stratum_server() {
// "doesnotexist" - error expected
let mut response = String::new();
let job_req = "{\"id\":\"4\",\"jsonrpc\":\"2.0\",\"method\":\"doesnotexist\"}\n";
let ok_resp = "{\"id\":\"4\",\"jsonrpc\":\"2.0\",\"result\":null,\"error\":{\"code\":-32601,\"message\":\"Method not found\"}}\n";
let ok_resp = "{\"id\":\"4\",\"jsonrpc\":\"2.0\",\"method\":\"doesnotexist\",\"result\":null,\"error\":{\"code\":-32601,\"message\":\"Method not found\"}}\n";
workers[3].write(job_req.as_bytes()).unwrap();
workers[3].flush().unwrap();
thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply