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(baseapp): fulfil all header.Info fields in test helpers context #23014

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

damiannolan
Copy link
Member

@damiannolan damiannolan commented Dec 19, 2024

Description

Just passing through... noticed along my ways.

I think its best to fulfil all fields here in header.Info. It can cause random failures for tests which rely on the NewUncachedContext() func.

I was migrating code to use services and as it still unwraps context for underlying fields we can run into some scenarios where header.Info has empty/unset fields.


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

    • Enhanced handling of block headers in context creation.
  • Bug Fixes

    • Improved data population for block header fields in the context.

Copy link
Contributor

coderabbitai bot commented Dec 19, 2024

📝 Walkthrough

Walkthrough

The pull request modifies the baseapp/test_helpers.go file, specifically enhancing the NewUncachedContext method. The primary change involves importing cmttypes and using cmttypes.HeaderFromProto to convert a cmtproto.Header to a cmttypes.Header. The method now populates the coreheader.Info struct with fields from the converted header, including AppHash, Hash, ChainID, Height, and Time. The overall structure and other methods in the file remain unchanged.

Changes

File Change Summary
baseapp/test_helpers.go - Added import for cmttypes
- Modified NewUncachedContext to use cmttypes.HeaderFromProto
- Updated header information extraction from cmtHeader

Possibly related PRs

Suggested labels

backport/v0.52.x

Suggested reviewers

  • aaronc
  • kocubinski
  • facundomedica
  • testinginprod
  • 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.

@@ -64,11 +65,15 @@ func (app *BaseApp) NewContext(isCheckTx bool) sdk.Context {
}

func (app *BaseApp) NewUncachedContext(isCheckTx bool, header cmtproto.Header) sdk.Context {
cmtHeader, _ := cmttypes.HeaderFromProto(&header)
Copy link
Member Author

Choose a reason for hiding this comment

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

I think its fine to discard error here. If you pass a bad header that's your own fault imo.

Calling cmtHeader.Hash() on nil will produce nil - https://github.com/cometbft/cometbft/blob/main/types/block.go#L447-L449

@damiannolan
Copy link
Member Author

Let me know if you want me to replicate in NewContextLegacy (as this does not set header.Info)

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

🧹 Nitpick comments (1)
baseapp/test_helpers.go (1)

72-76: LGTM: Proper population of header.Info fields

The changes properly populate all required fields from the converted header, which addresses the issue of random test failures mentioned in the PR objectives. The fields are populated in a logical order and include all necessary information:

  • AppHash
  • Hash (computed)
  • ChainID
  • Height
  • Time

Consider adding a comment explaining why we need to convert the header:

// Convert to cmttypes.Header to access computed fields like Hash()
cmtHeader, err := cmttypes.HeaderFromProto(&header)
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 69025c5 and a886d9b.

📒 Files selected for processing (1)
  • baseapp/test_helpers.go (2 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
baseapp/test_helpers.go (1)

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

🔇 Additional comments (1)
baseapp/test_helpers.go (1)

5-5: LGTM: Import statement follows conventions

The new import for cmttypes is properly placed and follows the Go conventions.

baseapp/test_helpers.go Show resolved Hide resolved
@julienrbrt julienrbrt added the backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release label Dec 19, 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!

@tac0turtle tac0turtle added this pull request to the merge queue Dec 19, 2024
Merged via the queue into main with commit 2c16372 Dec 19, 2024
83 of 84 checks passed
@tac0turtle tac0turtle deleted the damian/ctx-test-helpers-fix branch December 19, 2024 19:39
mergify bot pushed a commit that referenced this pull request Dec 19, 2024
julienrbrt pushed a commit that referenced this pull request Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants