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

WIP 2020 03 05 result round trip #15

Closed
wants to merge 5 commits into from
Closed

WIP 2020 03 05 result round trip #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ee7375
check validity of json
thedavidmeister Mar 5, 2020
41a610f
updated changelog and error message and tests for valid json detection
thedavidmeister Mar 5, 2020
70ac3ea
wip on result round tripping
thedavidmeister Mar 5, 2020
b20a949
fix json unserialisation when round tripping through itself
thedavidmeister Mar 5, 2020
054e721
fix result json better
thedavidmeister Mar 5, 2020
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: 7 additions & 1 deletion CHANGELOG-UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Added

- JsonString::from_json_unchecked added to skip validity checks
- TryFrom<&str> added for JsonString

### Changed

- JsonString::from_bytes and JsonString::from_json enforce valid json data

### Deprecated

### Removed

- From<&str> removed for JsonString (replaced with TryFrom)

### Fixed

### Security

2 changes: 1 addition & 1 deletion crates/holochain_json_api/src/error/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ mod tests {
fn test_to_json() {
let err = JsonError::new("foo");
assert_eq!(
JsonString::from_json("{\"ErrorGeneric\":\"foo\"}"),
JsonString::from_json("{\"ErrorGeneric\":\"foo\"}").unwrap(),
JsonString::from(err),
);
}
Expand Down
Loading