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

feat: check latest block if no arg in q block and q block-results #21084

Merged
merged 2 commits into from
Jul 29, 2024

Conversation

julienrbrt
Copy link
Member

@julienrbrt julienrbrt commented Jul 26, 2024

Description

Closes: #21081


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
    • Command now accepts zero or one argument for block height, ensuring backward compatibility.
    • Enhanced error handling provides more informative messages for block height parsing.
  • Bug Fixes
    • Improved handling of cases where no arguments are provided, defaulting to the latest block height.
  • Refactor
    • Streamlined code by removing unnecessary functions and simplifying block height handling.

@julienrbrt julienrbrt added backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release labels Jul 26, 2024
@julienrbrt julienrbrt requested a review from a team as a code owner July 26, 2024 09:26
Copy link
Contributor

coderabbitai bot commented Jul 26, 2024

Walkthrough

Walkthrough

The changes in the command handling logic enhance the flexibility of the CLI by allowing commands to accept zero or one argument for block height. This modification ensures backward compatibility while simplifying error handling and streamlining the internal logic of the command, thereby improving the user experience and robustness.

Changes

Files Change Summary
server/cmt_cmds.go Updated argument handling from ExactArgs(1) to MaximumNArgs(1) for optional block height; improved error handling and streamlined height parsing logic by removing the parseOptionalHeight function.

Assessment against linked issues

Objective Addressed Explanation
Allow zero args for query block to retrieve the latest block (##21081)
Maintain backward compatibility with version 0.50 behavior (##21081)
Ensure command defaults to block height rather than hash (##21081) The default handling was not explicitly changed.

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 Configuration 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.

@julienrbrt
Copy link
Member Author

I am adding a changelog in the v0.50 backport only.
Otherwise the flow becomes annoying when releasing patch versions

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

Outside diff range, codebase verification and nitpick comments (2)
server/cmt_cmds.go (2)

252-258: User Experience: Informative fallback message.

The message "Falling back to latest block height:" enhances user experience by informing them about the fallback behavior.

Consider using cmd.Printf instead of cmd.Println for consistency with other logging statements.

-        cmd.Println("Falling back to latest block height:")
+        cmd.Printf("Falling back to latest block height:\n")

332-336: User Experience: Informative fallback message.

The message "Falling back to latest block height:" enhances user experience by informing them about the fallback behavior.

Consider using cmd.Printf instead of cmd.Println for consistency with other logging statements.

-        cmd.Println("Falling back to latest block height:")
+        cmd.Printf("Falling back to latest block height:\n")
Review details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between cc5c4d0 and 55ea9c8.

Files selected for processing (1)
  • server/cmt_cmds.go (3 hunks)
Additional context used
Path-based instructions (1)
server/cmt_cmds.go (1)

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

Additional comments not posted (3)
server/cmt_cmds.go (3)

230-230: Correctness: Allow zero or one argument.

The change from cobra.ExactArgs(1) to cobra.MaximumNArgs(1) correctly allows the command to accept zero or one argument, restoring the previous functionality.


238-242: Logic: Handle zero arguments gracefully.

The new conditional logic correctly defaults the typ variable to auth.TypeHeight when no arguments are provided, ensuring backward compatibility.


325-336: Correctness: Handle zero arguments gracefully.

The new conditional logic correctly handles the case where no arguments are provided by fetching the latest block height.

Comment on lines 246 to 261
var (
err error
height int64
)
heightStr := args[0]

if heightStr == "" {
cmd.Println("Falling back to latest block height:")
height, err = rpc.GetChainHeight(clientCtx)
if err != nil {
return fmt.Errorf("failed to get chain height: %w", err)
}
} else {
height, err = strconv.ParseInt(heightStr, 10, 64)
if err != nil {
return err
return fmt.Errorf("failed to parse block height: %w", err)
Copy link
Contributor

Choose a reason for hiding this comment

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

Error Handling: Improve parsing logic.

The parsing logic for heightStr is improved, but there is a potential issue if args[0] is accessed when args is empty.

-        heightStr := args[0]
+        heightStr := ""
+        if len(args) > 0 {
+            heightStr = args[0]
+        }
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
var (
err error
height int64
)
heightStr := args[0]
if heightStr == "" {
cmd.Println("Falling back to latest block height:")
height, err = rpc.GetChainHeight(clientCtx)
if err != nil {
return fmt.Errorf("failed to get chain height: %w", err)
}
} else {
height, err = strconv.ParseInt(heightStr, 10, 64)
if err != nil {
return err
return fmt.Errorf("failed to parse block height: %w", err)
var (
err error
height int64
)
heightStr := ""
if len(args) > 0 {
heightStr = args[0]
}
if heightStr == "" {
cmd.Println("Falling back to latest block height:")
height, err = rpc.GetChainHeight(clientCtx)
if err != nil {
return fmt.Errorf("failed to get chain height: %w", err)
}
} else {
height, err = strconv.ParseInt(heightStr, 10, 64)
if err != nil {
return fmt.Errorf("failed to parse block height: %w", err)

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 55ea9c8 and 312e73d.

Files selected for processing (1)
  • server/cmt_cmds.go (3 hunks)
Additional context used
Path-based instructions (1)
server/cmt_cmds.go (1)

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

Additional comments not posted (4)
server/cmt_cmds.go (4)

230-230: Allow zero or one argument for block height.

Changing the Args property to cobra.MaximumNArgs(1) allows the command to accept zero or one argument, improving flexibility.


238-242: Handle cases where no arguments are provided.

The new conditional check ensures that the command defaults to querying by height if no arguments are provided, maintaining backward compatibility.


246-264: Improved parsing logic for block height.

The logic for parsing the block height has been updated to handle cases where no arguments are provided, falling back to the latest block height if necessary. Error handling has been enhanced.


328-339: Handle cases where no arguments are provided.

The new conditional check ensures that the command falls back to the latest block height if no arguments are provided, improving flexibility and user experience.

@julienrbrt julienrbrt added this pull request to the merge queue Jul 29, 2024
Merged via the queue into main with commit c4de9a9 Jul 29, 2024
74 checks passed
@julienrbrt julienrbrt deleted the julien/args branch July 29, 2024 22:56
mergify bot pushed a commit that referenced this pull request Jul 29, 2024
…#21084)

(cherry picked from commit c4de9a9)

# Conflicts:
#	server/cmt_cmds.go
mergify bot pushed a commit that referenced this pull request Jul 29, 2024
…#21084)

(cherry picked from commit c4de9a9)

# Conflicts:
#	server/cmt_cmds.go
tac0turtle pushed a commit that referenced this pull request Jul 30, 2024
… (backport #21084) (#21111)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: sontrinh16 <trinhleson2000@gmail.com>
tac0turtle added a commit that referenced this pull request Jul 30, 2024
… (backport #21084) (#21110)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
julienrbrt added a commit that referenced this pull request Sep 12, 2024
mergify bot pushed a commit that referenced this pull request Sep 12, 2024
…21681)

(cherry picked from commit 766117c)

# Conflicts:
#	server/v2/cometbft/go.mod
#	simapp/gomod2nix.toml
julienrbrt added a commit that referenced this pull request Sep 12, 2024
…ackport #21681) (#21684)

Co-authored-by: Julien Robert <julien@rbrt.fr>
alpe added a commit that referenced this pull request Sep 12, 2024
* main:
  refactor(server/v2/cometbft): use only protov1 and backport #21084 (#21681)
  chore(x/staking): revert proto breakage (#21666)
  build(deps): bump rocksdb & core & update ci codeowners (#21652)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release 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.

[Bug(CLI)]: query block can no longer be used to get the most recent block
5 participants