bitreq: Re-implement json-using-serde feature
#398
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tcharding
force-pushed
the
push-rvqmqwwmqtvm
branch
from
e45e36b to
722ee7a
Compare
tcharding
force-pushed
the
push-rvqmqwwmqtvm
branch
from
69deb6d to
be01458
Compare
tcharding
changed the title
json-using-serde featurejson-using-serde feature
bitreq/src/response.rs
Outdated
| /// ```no_run | ||
| /// use serde_json::Value; | ||
| /// | ||
| /// # fn main() -> Result<(), minreq::Error> { |
Collaborator
There was a problem hiding this comment.
Suggested change
| /// # fn main() -> Result<(), minreq::Error> { | |
| /// # fn main() -> Result<(), bitreq::Error> { |
bitreq/src/response.rs
Outdated
| /// # fn main() -> Result<(), minreq::Error> { | ||
| /// # let url_to_json_resource = "http://example.org/resource.json"; | ||
| /// // Value could be any type that implements Deserialize! | ||
| /// let user = minreq::get(url_to_json_resource).send()?.json::<Value>()?; |
Collaborator
There was a problem hiding this comment.
Suggested change
| /// let user = minreq::get(url_to_json_resource).send()?.json::<Value>()?; | |
| /// let user = bitreq::get(url_to_json_resource).send()?.json::<Value>()?; |
Collaborator
There was a problem hiding this comment.
Why are these not caught in CI? I get an error locally. Ah, is it because of #400 not being merged yet?
bitreq/tests/main.rs
Outdated
| let original_json: serde_json::Value = serde_json::from_str(JSON_SRC).unwrap(); | ||
| let response = bitreq::post(url("/echo")).with_json(&original_json).unwrap().send().unwrap(); | ||
| let actual_json: serde_json::Value = response.json().unwrap(); | ||
| assert_eq!(&actual_json, &original_json); |
Collaborator
There was a problem hiding this comment.
Suggested change
| assert_eq!(&actual_json, &original_json); | |
| assert_eq!(actual_json, original_json); |
bitreq/src/response.rs
Outdated
Comment on lines
160
to
166
| let str = match self.as_str() { | ||
| Ok(str) => str, | ||
| Err(_) => return Err(Error::InvalidUtf8InResponse), | ||
| }; | ||
| match serde_json::from_str(str) { | ||
| Ok(json) => Ok(json), | ||
| Err(err) => Err(Error::SerdeJsonError(err)), |
Collaborator
There was a problem hiding this comment.
Suggested change
| let str = match self.as_str() { | |
| Ok(str) => str, | |
| Err(_) => return Err(Error::InvalidUtf8InResponse), | |
| }; | |
| match serde_json::from_str(str) { | |
| Ok(json) => Ok(json), | |
| Err(err) => Err(Error::SerdeJsonError(err)), | |
| serde_json::from_str(self.as_str()?) | |
| .map_err(Error::SerdeJsonError) |
The existing code returns the incorrect error variant. The docs say InvalidUtf8InBody which is what as_str() returns.
Member
Author
There was a problem hiding this comment.
Half right I think. Your suggestion is correct and better but AFAICT it doesn't change the logic. I used the suggestion.
This feature was removed when we gutted `minreq` after forking it. Turns out we need it to be able to use `bitreq` in `jsonrpc`. Re-implement the feature by copying code from `minreq`. After copy, fix docs to mention `bitreq` and also refactor some error logic to use `as_str()?` directly (no logic change).
tcharding
force-pushed
the
push-rvqmqwwmqtvm
branch
from
be01458 to
99c948c
Compare
Collaborator
oleonardolima
left a comment
oleonardolima
left a comment
There was a problem hiding this comment.
tACK 99c948c
I've tested it locally, and with the rust-esplora-client PR (see bitcoindevkit/rust-esplora-client#137), and it works just fine.
tcharding
added a commit
to tcharding/corepc
that referenced
this pull request
Oct 30, 2025
99c948c Re-implement json-using-serde feature (Tobin C. Harding) 1251953 Replace stale docs reference to minreq (Tobin C. Harding) Pull request description: This feature was removed when we gutted `minreq` after forking it. Turns out we need it to be able to use `bitreq` in `jsonrpc`. Re-implement the feature by copying code from `minreq`. Close: rust-bitcoin#393 ACKs for top commit: oleonardolima: tACK 99c948c jamillambert: ACK 99c948c Tree-SHA512: 2e22881566fd3d75e0edb70567dac0b1ed9ce66720511dcead888b2b7686fc89fb1f6bce3bd490f91997e9ade88b0665b00679c79bcef35205c6ce1117306faf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This feature was removed when we gutted
minreqafter forking it. Turns out we need it to be able to usebitreqinjsonrpc.Re-implement the feature by copying code from
minreq.Close: #393