hibas123/JsonRPC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make result field of JRPCResult Optional

Browse Source
This commit is contained in:
Fabian Stamm 2023-04-25 08:55:57 +02:00
parent 04f82b655b
commit 132390fa35
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@hibas123/jrpcgen", "name": "@hibas123/jrpcgen",
"version": "1.2.12", "version": "1.2.13",
"main": "lib/index.js", "main": "lib/index.js",
"license": "MIT", "license": "MIT",
"packageManager": "yarn@3.1.1", "packageManager": "yarn@3.1.1",

10
templates/Rust/src/lib.rs
View File

@ -40,7 +40,7 @@ pub struct JRPCError {
pub struct JRPCResult { pub struct JRPCResult {
pub jsonrpc: String, pub jsonrpc: String,
pub id: String, pub id: String,
pub result: Value, pub result: Option<Value>,
pub error: Option<JRPCError>, pub error: Option<JRPCError>,
} }
@ -76,8 +76,10 @@ impl JRPCClient {
if let Some(result) = result { if let Some(result) = result {
if let Some(error) = result.error { if let Some(error) = result.error {
return Err(format!("Error while receiving result: {}", error.message).into()); return Err(format!("Error while receiving result: {}", error.message).into());
} else if let Some(result) = result.result {
return Ok(result);
} else { } else {
return Ok(result.result); return Err(format!("No result received").into());
} }
} else { } else {
return Err("Error while receiving result".into()); return Err("Error while receiving result".into());
@ -133,7 +135,7 @@ impl JRPCSession {
let result = JRPCResult { let result = JRPCResult {
jsonrpc: "2.0".to_string(), jsonrpc: "2.0".to_string(),
id: request_id, id: request_id,
result: Value::Null, result: None,
error: Some(error), error: Some(error),
}; };
@ -169,7 +171,7 @@ impl JRPCSession {
.send(JRPCResult { .send(JRPCResult {
jsonrpc: "2.0".to_string(), jsonrpc: "2.0".to_string(),
id: request.id.unwrap(), id: request.id.unwrap(),
result, result: Some(result),
error: None, error: None,
}) })
.await; .await;