Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/src/mining/stratumserver.rs
View file

@ -53,6 +53,7 @@ struct RpcRequest {
struct RpcResponse { struct RpcResponse {
id: String, id: String,
jsonrpc: String, jsonrpc: String,
method: String,
result: Option<String>, result: Option<String>,
error: Option<RpcError>, error: Option<RpcError>,
} }
@ -329,6 +330,7 @@ impl StratumServer {
let resp = RpcResponse { let resp = RpcResponse {
id: workers_l[num].id.clone(), id: workers_l[num].id.clone(),
jsonrpc: String::from("2.0"), jsonrpc: String::from("2.0"),
method: request.method,
result: None, result: None,
error: Some(rpc_err), error: Some(rpc_err),
}; };
@ -337,6 +339,7 @@ impl StratumServer {
let resp = RpcResponse { let resp = RpcResponse {
id: workers_l[num].id.clone(), id: workers_l[num].id.clone(),
jsonrpc: String::from("2.0"), jsonrpc: String::from("2.0"),
method: request.method,
result: Some(response), result: Some(response),
error: None, error: None,
}; };

4
servers/tests/stratum.rs
View file

@ -117,7 +117,7 @@ fn basic_stratum_server() {
// keepalive - expected "ok" result // keepalive - expected "ok" result
let mut response = String::new(); let mut response = String::new();
let job_req = "{\"id\":\"3\",\"jsonrpc\":\"2.0\",\"method\":\"keepalive\"}\n"; 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].write(job_req.as_bytes()).unwrap();
workers[2].flush().unwrap(); workers[2].flush().unwrap();
thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply
@ -127,7 +127,7 @@ fn basic_stratum_server() {
// "doesnotexist" - error expected // "doesnotexist" - error expected
let mut response = String::new(); let mut response = String::new();
let job_req = "{\"id\":\"4\",\"jsonrpc\":\"2.0\",\"method\":\"doesnotexist\"}\n"; 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].write(job_req.as_bytes()).unwrap();
workers[3].flush().unwrap(); workers[3].flush().unwrap();
thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply thread::sleep(time::Duration::from_secs(1)); // Wait for the server to reply