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.

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

Fix proto3 JSON #6345

Merged
merged 6 commits into from
Jun 5, 2020
Merged

Fix proto3 JSON #6345

merged 6 commits into from
Jun 5, 2020

Conversation

aaronc
Copy link
Member

@aaronc aaronc commented Jun 5, 2020

ref #6213

Adding support for Amino JSON to Any broke proto3 JSON (jsonpb). This PR fixes that and adds tests.


For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

@codecov
Copy link

codecov bot commented Jun 5, 2020

Codecov Report

Merging #6345 into master will increase coverage by 0.00%.
The diff coverage is 73.17%.

@@           Coverage Diff           @@
##           master    #6345   +/-   ##
=======================================
  Coverage   55.66%   55.66%           
=======================================
  Files         448      448           
  Lines       26965    26983   +18     
=======================================
+ Hits        15009    15020   +11     
- Misses      10879    10884    +5     
- Partials     1077     1079    +2     

@aaronc aaronc changed the title Fix jsonpb Fix protobuf JSON Jun 5, 2020
@aaronc aaronc changed the title Fix protobuf JSON Fix proto3 JSON Jun 5, 2020
@aaronc aaronc marked this pull request as ready for review June 5, 2020 00:37
@aaronc aaronc added the R4R label Jun 5, 2020
Copy link
Collaborator

@fedekunze fedekunze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@alexanderbez alexanderbez added the A:automerge Automatically merge PR once all prerequisites pass. label Jun 5, 2020
@mergify mergify bot merged commit 1e6953c into master Jun 5, 2020
@mergify mergify bot deleted the aaronc/6213-fix-jsonpb branch June 5, 2020 14:20
@clevinson clevinson added this to the v0.39 milestone Jun 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants