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

Refactor panic to use return error #6391

Merged

Conversation

chatton
Copy link
Contributor

@chatton chatton commented May 27, 2024

Description

closes: #6387


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the 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 and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

Summary by CodeRabbit

  • Bug Fixes

    • Improved error handling in packet data conversion to prevent application crashes.
  • Refactor

    • Enhanced internal logic for converting packet data with better error management.
  • Tests

    • Updated test cases to align with new error handling improvements.

@chatton chatton changed the title chore: refactor panic to use return error Refactor panic to use return error May 27, 2024
Copy link
Contributor

coderabbitai bot commented May 27, 2024

Walkthrough

The changes focus on improving error handling in the ICS20-V2 conversion logic within the IBCModule. Specifically, panics have been replaced with error returns to enhance stability and robustness. This involves updates to the unmarshalPacketDataBytesToICS20V2 function, the PacketDataV1ToV2 function, and corresponding test cases.

Changes

File Path Change Summary
modules/apps/transfer/ibc_module.go Removed ValidateBasic() call and updated unmarshalPacketDataBytesToICS20V2 to handle errors better.
modules/apps/transfer/internal/convert/convert.go Updated PacketDataV1ToV2 to return errors instead of panicking, added error handling, and imported errorsmod.
modules/apps/transfer/internal/convert/convert_test.go Adjusted test function TestConvertPacketV1ToPacketV2 to handle errors, renamed expPanic to expError.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant Client
    participant IBCModule
    participant ConvertInternal

    Client->>IBCModule: Call unmarshalPacketDataBytesToICS20V2(bz, ics20Version)
    IBCModule->>ConvertInternal: Call PacketDataV1ToV2(datav1)
    ConvertInternal-->>IBCModule: Return convertedData, error
    IBCModule-->>Client: Return convertedData, error
Loading

Assessment against linked issues

Objective Addressed Explanation
Clean up panics in ICS20-V2 conversion logic (#6387)
Amend test cases to use FungibleTokenPacketDataV2 (#6356) Changes to test cases were made, but it's unclear if all required amendments were included.
Use expected errors in ibc_module_test.go for transfer module (#6214) The changes focus on convert_test.go, not ibc_module_test.go.
Rework TestPacketForwardsCompatibility to use ics20 v2 and check for acks (#6365) No changes related to TestPacketForwardsCompatibility were mentioned.

Possibly related issues


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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

@DimitrisJim DimitrisJim left a comment

Choose a reason for hiding this comment

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

lgtm!

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: 2

Outside diff range and nitpick comments (1)
modules/apps/transfer/internal/convert/convert.go (1)

14-16: Refactor to return errors instead of panicking enhances robustness and error traceability.

Consider improving the error message to include more context about the validation failure.

Review Details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits Files that changed from the base of the PR and between dcf6e34 and f4f3989.
Files selected for processing (3)
  • modules/apps/transfer/ibc_module.go (1 hunks)
  • modules/apps/transfer/internal/convert/convert.go (3 hunks)
  • modules/apps/transfer/internal/convert/convert_test.go (2 hunks)
Additional Context Used
Path-based Instructions (3)
modules/apps/transfer/internal/convert/convert.go (1)

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

modules/apps/transfer/internal/convert/convert_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"

modules/apps/transfer/ibc_module.go (1)

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

Additional comments not posted (1)
modules/apps/transfer/ibc_module.go (1)

187-187: Refactor to handle different ICS20 versions and return errors enhances robustness.

Ensure that all potential ICS20 versions are correctly handled to avoid runtime errors.

#!/bin/bash
# Description: Verify all ICS20 versions are handled in `unmarshalPacketDataBytesToICS20V2`.

# Test: Search for version handling in the function. Expect: Handling for all known versions.
rg --type go $'unmarshalPacketDataBytesToICS20V2' modules/apps/transfer/ibc_module.go

@@ -40,7 +44,7 @@ func ExtractDenomAndTraceFromV1Denom(v1Denom string) (string, []string) {

// this condition should never be reached.
if len(splitPath)%2 != 0 {
panic("pathSlice length is not even")
panic(fmt.Errorf("path slice length is not even"))
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider replacing panic with error handling to maintain consistency in error handling across the codebase.

@@ -20,7 +20,7 @@ func TestConvertPacketV1ToPacketV2(t *testing.T) {
name string
v1Data types.FungibleTokenPacketData
v2Data types.FungibleTokenPacketDataV2
expPanic error
expError error
Copy link
Contributor

Choose a reason for hiding this comment

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

Updated test cases to reflect new error handling in PacketDataV1ToV2.

Consider adding more edge cases to ensure comprehensive coverage.

Would you like assistance in identifying potential edge cases for additional tests?

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

Review Details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits Files that changed from the base of the PR and between f4f3989 and a53759b.
Files selected for processing (3)
  • modules/apps/transfer/ibc_module.go (1 hunks)
  • modules/apps/transfer/internal/convert/convert.go (3 hunks)
  • modules/apps/transfer/internal/convert/convert_test.go (2 hunks)
Files skipped from review as they are similar to previous changes (3)
  • modules/apps/transfer/ibc_module.go
  • modules/apps/transfer/internal/convert/convert.go
  • modules/apps/transfer/internal/convert/convert_test.go

Copy link

Quality Gate Passed Quality Gate passed for 'ibc-go'

Issues
11 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@chatton chatton merged commit 977573b into main May 29, 2024
73 of 76 checks passed
@chatton chatton deleted the cian/issue#6387-clean-up-panics-in-ics20v2-conversion-logic branch May 29, 2024 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clean up panics in ICS20-V2 conversion logic
4 participants