Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make jsonrpc protocol version field in Response as Option #1046

Merged
merged 4 commits into from
Mar 16, 2023
Merged

Make jsonrpc protocol version field in Response as Option #1046

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f03323
use `Option` for `jsonrpc` field in `Response`
gnapoli23 Mar 15, 2023
69d2133
add tests for serializing/deserializing `Response`
gnapoli23 Mar 15, 2023
8b2d55a
cargo fmt
gnapoli23 Mar 15, 2023
b2460bf
manage missing field in serializing
gnapoli23 Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions types/src/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Debug)]
pub struct Response<'a, T> {
/// JSON-RPC version.
pub jsonrpc: TwoPointZero,
pub jsonrpc: Option<TwoPointZero>,
/// Result.
pub result: T,
/// Request ID
Expand All @@ -47,7 +47,7 @@ pub struct Response<'a, T> {
impl<'a, T> Response<'a, T> {
/// Create a new [`Response`].
pub fn new(result: T, id: Id<'a>) -> Response<'a, T> {
Response { jsonrpc: TwoPointZero, result, id }
Response { jsonrpc: Some(TwoPointZero), result, id }
}

/// Create an owned [`Response`].
Expand Down Expand Up @@ -93,14 +93,14 @@ mod tests {

#[test]
fn serialize_call_response() {
let ser = serde_json::to_string(&Response { jsonrpc: TwoPointZero, result: "ok", id: Id::Number(1) }).unwrap();
let ser = serde_json::to_string(&Response { jsonrpc: Some(TwoPointZero), result: "ok", id: Id::Number(1) }).unwrap();
let exp = r#"{"jsonrpc":"2.0","result":"ok","id":1}"#;
assert_eq!(ser, exp);
}

#[test]
fn deserialize_call() {
niklasad1 marked this conversation as resolved.
Show resolved Hide resolved
let exp = Response { jsonrpc: TwoPointZero, result: 99_u64, id: Id::Number(11) };
let exp = Response { jsonrpc: Some(TwoPointZero), result: 99_u64, id: Id::Number(11) };
let dsr: Response<u64> = serde_json::from_str(r#"{"jsonrpc":"2.0", "result":99, "id":11}"#).unwrap();
assert_eq!(dsr.jsonrpc, exp.jsonrpc);
assert_eq!(dsr.result, exp.result);
Expand Down