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

test(x/tx): add amino JSON pretty bytes demonstration test #21935

Merged
merged 1 commit into from
Sep 26, 2024

Conversation

kocubinski
Copy link
Member

@kocubinski kocubinski commented Sep 26, 2024

Description

Related: #21850, #15740

This adds a test showing how a developer could set up a "pretty" bytes encoder for arbitrary bytes, which are now supported as a signer field. The default is base64 encoding, as this is the encoding/json std implementation spec.

Also fixed a problem in the buf work file, as this was causing the error below when regenerating test pbs.

Generating proto files
Failure: directory "x/auth/proto" listed in ../../../../../buf.work.yaml contains no .proto files
make: *** [codegen] Error 1

Test output with the hex encoder:

 hex encoded bytes: {"type":"ABitOfEverything","value":{"bytes":"n4bQgYhMfWWaL+qgxVrQFaO/TxsrC4Is0V1sFbDwCgg=","pretty_bytes":"9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"}}

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • New Features

    • Introduced a new field pretty_bytes to the ABitOfEverything message for enhanced data handling.
    • Added a custom bytes encoder for the pretty_bytes field, allowing for hexadecimal string formatting.
  • Bug Fixes

    • Adjusted existing fields for consistency in the test.proto file.
  • Tests

    • Implemented a new test function to validate the serialization of the ABitOfEverything message with the new field.

Copy link
Contributor

coderabbitai bot commented Sep 26, 2024

📝 Walkthrough

Walkthrough

The pull request includes changes to several files, primarily focusing on the removal of the x/auth/proto directory from the buf.work.yaml configuration. Additionally, it introduces a new field pretty_bytes to the ABitOfEverything message in the test.proto file, along with corresponding updates in the generated Go code. A new test function is also added to validate the serialization of the updated message structure using custom encoding.

Changes

File Path Change Summary
buf.work.yaml Removed directory entry for x/auth/proto.
x/tx/signing/aminojson/internal/testpb/test.proto Added new field bytes pretty_bytes = 20 [(amino.encoding) = "hex"]; to the ABitOfEverything message, with existing fields reformatted for consistency.
x/tx/signing/aminojson/internal/testpb/test.pulsar.go Introduced PrettyBytes field in struct ABitOfEverything, updated serialization methods, and modified the init function and message descriptors accordingly.
x/tx/signing/aminojson/json_marshal_test.go Added TestCustomBytesEncoder function to test serialization of ABitOfEverything with custom byte encoding, comparing outputs from legacy and new JSON encoders.

Possibly related PRs

Suggested reviewers

  • aaronc
  • testinginprod
  • kocubinski
  • julienrbrt
  • tac0turtle

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
x/tx/signing/aminojson/json_marshal_test.go (1)

437-442: Consider adding error handling for the custom encoding function

The custom field encoding function for "hex" is concise and clear. However, it might be beneficial to add error handling for the Fprintf call, even though it's unlikely to fail for byte slices.

Consider updating the custom encoding function as follows:

 encoder.DefineFieldEncoding(
     "hex",
     func(enc *aminojson.Encoder, v protoreflect.Value, w io.Writer) error {
-        _, err := fmt.Fprintf(w, "\"%x\"", v.Bytes())
-        return err
+        n, err := fmt.Fprintf(w, "\"%x\"", v.Bytes())
+        if err != nil {
+            return err
+        }
+        if n == 0 {
+            return fmt.Errorf("no bytes written")
+        }
+        return nil
     })
📜 Review details

Configuration used: .coderabbit.yml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 2d8ca73 and 5a9402e.

📒 Files selected for processing (4)
  • buf.work.yaml (0 hunks)
  • x/tx/signing/aminojson/internal/testpb/test.proto (1 hunks)
  • x/tx/signing/aminojson/internal/testpb/test.pulsar.go (16 hunks)
  • x/tx/signing/aminojson/json_marshal_test.go (2 hunks)
💤 Files not reviewed due to no reviewable changes (1)
  • buf.work.yaml
🧰 Additional context used
📓 Path-based instructions (2)
x/tx/signing/aminojson/internal/testpb/test.pulsar.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

x/tx/signing/aminojson/json_marshal_test.go (2)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.


Pattern **/*_test.go: "Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request"

🔇 Additional comments (18)
x/tx/signing/aminojson/internal/testpb/test.proto (3)

48-48: LGTM: New field pretty_bytes added correctly

The addition of the pretty_bytes field with the amino.encoding option set to "hex" is well-implemented. This change aligns with the PR objective of demonstrating a "pretty" bytes encoder for arbitrary bytes. The field is correctly placed at the end of the message (field number 20), which maintains backward compatibility.


35-47: Formatting improvements enhance readability

The formatting changes in these lines improve the overall readability and consistency of the Protocol Buffer definition. The adjustments in spacing make the field definitions more uniform and easier to scan. These changes align with good coding practices for .proto files.


35-48: Changes align well with PR objectives

The modifications in this file, particularly the addition of the pretty_bytes field and the formatting improvements, successfully address the PR's objective of demonstrating how to set up a "pretty" bytes encoder for arbitrary bytes. The use of the amino.encoding option with "hex" value provides a clear example of how to achieve the desired encoding. These changes contribute to enhancing the functionality and readability of the amino JSON encoding process within the Cosmos SDK.

x/tx/signing/aminojson/json_marshal_test.go (2)

419-447: LGTM: Well-structured test demonstrating custom byte encoding

This test function effectively demonstrates the use of custom byte encoding for the ABitOfEverything message. It compares the default encoding with a custom hex encoding, showcasing the flexibility of the aminojson.Encoder.

The test structure follows Go best practices, using require assertions for clear error reporting. The use of SHA-256 for generating test bytes is a good choice for reproducibility.


443-446: LGTM: Effective comparison of legacy and custom encoding results

The comparison between legacy JSON and custom amino JSON encoding is well-implemented. The use of require.NotEqual ensures that the custom encoding produces different results from the legacy encoding, which is the expected behavior.

The logging of hex-encoded bytes is helpful for debugging and understanding the output.

x/tx/signing/aminojson/internal/testpb/test.pulsar.go (13)

1758-1775: Field Descriptor for PrettyBytes Added Correctly

The declaration and initialization of fd_ABitOfEverything_pretty_bytes ensure that the PrettyBytes field is properly integrated into the protobuf reflection mechanism.

Also applies to: 1797-1797


1961-1966: Inclusion of PrettyBytes in Range Method

The Range method correctly handles the PrettyBytes field, allowing it to be iterated over alongside other populated fields.


2014-2015: Accurate Implementation of Has for PrettyBytes

The Has method correctly checks the PrettyBytes field for non-zero length, ensuring accurate presence detection.


2064-2065: Proper Clearing of PrettyBytes in Clear Method

The Clear method appropriately sets PrettyBytes to nil, effectively clearing its value.


2133-2135: Correct Retrieval in Get Method for PrettyBytes

The Get method accurately retrieves the value of PrettyBytes, returning it as a protoreflect.ValueOfBytes.


2190-2191: Appropriate Assignment in Set Method for PrettyBytes

The Set method correctly assigns the provided bytes value to the PrettyBytes field.


2251-2252: Expected Panic in Mutable Method for PrettyBytes

The Mutable method correctly panics when called for the non-composite PrettyBytes field, consistent with the handling of similar scalar fields.


2300-2301: NewField Method Returns Default for PrettyBytes

The NewField method properly returns a default nil value for the PrettyBytes field, aligning with expected behavior.


2426-2429: Inclusion of PrettyBytes in Size Calculation

The size computation within ProtoMethods accurately accounts for the PrettyBytes field, ensuring correct message sizing.


2459-2467: Correct Serialization in Marshal Method for PrettyBytes

The Marshal method properly serializes the PrettyBytes field, handling length encoding and field numbering correctly.


3018-3051: Accurate Deserialization in Unmarshal Method for PrettyBytes

The Unmarshal method correctly deserializes the PrettyBytes field, including handling of length prefixes and data copying.


4265-4265: Addition of PrettyBytes Field to ABitOfEverything Struct

The new PrettyBytes []byte field is correctly added to the ABitOfEverything struct with appropriate protobuf tags and JSON annotations.


4400-4405: Correct Implementation of GetPrettyBytes Method

The GetPrettyBytes accessor method is properly implemented, providing safe access to the PrettyBytes field.

@julienrbrt julienrbrt changed the title tests(x/tx): add amino JSON pretty bytes demonstration test test(x/tx): add amino JSON pretty bytes demonstration test Sep 26, 2024
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

ACK

@julienrbrt julienrbrt linked an issue Sep 26, 2024 that may be closed by this pull request
2 tasks
@tac0turtle tac0turtle added this pull request to the merge queue Sep 26, 2024
Merged via the queue into main with commit e4240b6 Sep 26, 2024
74 of 77 checks passed
@tac0turtle tac0turtle deleted the kocu/amino-pretty-bytes-test branch September 26, 2024 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support bytes signer fields
3 participants