Skip to content

refactor: use a more straightforward return value #23718

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

Merged
merged 1 commit into from
Mar 3, 2025
Merged

refactor: use a more straightforward return value #23718

merged 1 commit into from
Mar 3, 2025

Conversation

fuyangpengqi
Copy link
Contributor

@fuyangpengqi fuyangpengqi commented Feb 17, 2025

Description

use a more straightforward return value


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

  • Bug Fixes
    • Improved error management to ensure operations consistently signal success, reducing spurious error responses and enhancing overall system stability.

@fuyangpengqi fuyangpengqi requested a review from a team February 17, 2025 15:57
Copy link
Contributor

coderabbitai bot commented Feb 17, 2025

📝 Walkthrough

Walkthrough

The pull request updates error handling in two methods. In the auth migration, the MarshalYAML method of the StdSignature struct now returns a nil error instead of propagating the original error from marshaling. Similarly, in the staking keeper, the GetDelegatorUnbonding method has been modified to return a nil error instead of a potential error value. These changes standardize the functions to always succeed in terms of error reporting.

Changes

File(s) Change Summary
x/auth/migrations/legacytx/stdsign.go, x/staking/keeper/delegation.go Modified return statements in MarshalYAML and GetDelegatorUnbonding to always return nil for the error, bypassing the propagation of any errors.

Suggested labels

C:x/tx

Suggested reviewers

  • kocubinski
  • aaronc
  • julienrbrt
  • testinginprod
  • hieuvubk
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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: 2

📜 Review details

Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a01cb3b and cc03c77.

📒 Files selected for processing (2)
  • x/auth/migrations/legacytx/stdsign.go (1 hunks)
  • x/staking/keeper/delegation.go (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
`**/*.go`: Review the Golang code for conformity with the Ub...

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

  • x/auth/migrations/legacytx/stdsign.go
  • x/staking/keeper/delegation.go
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: test-system-v2
  • GitHub Check: Analyze
  • GitHub Check: Summary

@@ -129,7 +129,7 @@ func (ss StdSignature) MarshalYAML() (interface{}, error) {
return nil, err
}

return string(bz), err
return string(bz), nil
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 17, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue

Reconsider error handling approach.

Suppressing the YAML marshaling error by returning nil could hide potential issues from callers. Consider propagating the original error to allow proper error handling upstream.

Apply this diff to restore proper error handling:

-	return string(bz), nil
+	return string(bz), err
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
return string(bz), nil
return string(bz), err

Copy link
Contributor

Choose a reason for hiding this comment

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

check again, rabbit!

Copy link
Contributor

Choose a reason for hiding this comment

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

@technicallyty You're right! I apologize for my previous comment. The current implementation is correct because:

  1. The error from yaml.Marshal is already properly handled in the if err != nil check
  2. If execution reaches the final return statement, the marshaling was successful
  3. Therefore, returning nil as the error is appropriate here

I'm retracting my previous suggestion. Thank you for the correction!

(`・ω・´)ゞ


✏️ Learnings added
Learnt from: technicallyty
PR: cosmos/cosmos-sdk#23718
File: x/auth/migrations/legacytx/stdsign.go:132-132
Timestamp: 2025-02-19T17:26:40.793Z
Learning: In the `MarshalYAML` method of `StdSignature`, returning `nil` as error in the final return statement is correct when the marshaling operation has already been validated by an earlier error check.

Note: Learnings are effective only in the context of similar code segments. To apply general coding guidelines, please configure review instructions. You can manage existing learnings in the app.

@@ -209,7 +209,7 @@ func (k Keeper) GetDelegatorUnbonding(ctx context.Context, delegator sdk.AccAddr
if err != nil {
return unbonding, err
}
return unbonding, err
return unbonding, nil
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 17, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue

Restore error propagation.

Suppressing the error from the Walk operation by returning nil could hide potential issues from callers. Consider propagating the original error to allow proper error handling upstream.

Apply this diff to restore proper error handling:

-	return unbonding, nil
+	return unbonding, err
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
return unbonding, nil
return unbonding, err

Copy link
Contributor

Choose a reason for hiding this comment

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

thats wrong rabbit. the error is handled above!

Copy link
Contributor

Choose a reason for hiding this comment

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

@technicallyty You're absolutely right, I apologize for the confusion. The error is properly handled in the check above, and returning nil as the error is correct in this case since we've already verified no error occurred during the Walk operation.


✏️ Learnings added
Learnt from: technicallyty
PR: cosmos/cosmos-sdk#23718
File: x/staking/keeper/delegation.go:212-212
Timestamp: 2025-02-19T01:32:16.298Z
Learning: In Go functions, when an error is explicitly checked and handled in an if statement that returns early, it's correct to return nil as the error value after the check since we've confirmed no error occurred in the operation.

Note: Learnings are effective only in the context of similar code segments. To apply general coding guidelines, please configure review instructions. You can manage existing learnings in the app.


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

@fuyangpengqi
Copy link
Contributor Author

Thanks for your approved.

@aljo242 aljo242 merged commit 4d47461 into cosmos:main Mar 3, 2025
68 of 71 checks passed
mergify bot pushed a commit that referenced this pull request Mar 3, 2025
Signed-off-by: fuyangpengqi <[email protected]>
(cherry picked from commit 4d47461)

# Conflicts:
#	x/staking/keeper/delegation.go
aljo242 added a commit that referenced this pull request Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants