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(core/gas): Add consumed API for GasMeter #21443

Merged
merged 3 commits into from
Aug 29, 2024

Conversation

sontrinh16
Copy link
Member

@sontrinh16 sontrinh16 commented Aug 28, 2024

Description

Closes: #21440


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 method to retrieve the total amount of gas consumed, enhancing gas tracking capabilities.
    • Added mocking methods to improve simulation of gas consumption interactions in unit tests.
  • Improvements

    • Updated existing methods to report gas consumption more accurately, shifting focus from remaining gas to total gas consumed.

@sontrinh16 sontrinh16 requested a review from a team as a code owner August 28, 2024 13:44
Copy link
Contributor

coderabbitai bot commented Aug 28, 2024

Walkthrough

Walkthrough

The changes introduce a new Consumed() method to the Meter interface, enhancing gas consumption tracking. Corresponding updates are made to the MockMeter for testing purposes and to the CoreGasmeter and SDKGasMeter structs to ensure consistent reporting of gas consumed. These modifications address inaccuracies in the existing gas consumption methods, particularly within the SDKGasMeter implementation.

Changes

Files Change Summary
core/gas/service.go Added Consumed() method to Meter interface for retrieving total gas consumed.
core/testing/gas/service_mocks.go Introduced Consumed methods in MockMeter and MockMeterMockRecorder for enhanced testing capabilities.
runtime/gas.go Added Consumed() method to CoreGasmeter and modified GasConsumed() and GasConsumedToLimit() methods in SDKGasMeter to reflect gas consumed instead of remaining.

Assessment against linked issues

Objective Addressed Explanation
SDKGasMeter.GasConsumedToLimit returns incorrect values (#[21440])

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

@sontrinh16 your pull request is missing a changelog!

@julienrbrt julienrbrt added backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release and removed C:core/testing labels Aug 28, 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

@@ -38,6 +38,7 @@ type Meter interface {
Consume(amount Gas, descriptor string) error
Refund(amount Gas, descriptor string) error
Remaining() Gas
Consumed() Gas
Copy link
Member

Choose a reason for hiding this comment

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

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 355f4d7 and 4d7ebe5.

Files selected for processing (3)
  • core/gas/service.go (1 hunks)
  • core/testing/gas/service_mocks.go (1 hunks)
  • runtime/gas.go (2 hunks)
Additional context used
Path-based instructions (3)
core/gas/service.go (1)

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

runtime/gas.go (1)

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

core/testing/gas/service_mocks.go (1)

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

Additional comments not posted (6)
core/gas/service.go (1)

41-41: LGTM!

The addition of the Consumed() method to the Meter interface is logical and aligns with the objective of accurately reporting gas consumption.

The code changes are approved.

runtime/gas.go (3)

39-41: LGTM!

The addition of the Consumed() method to the CoreGasmeter struct enhances its functionality by allowing users to access gas consumption metrics directly.

The code changes are approved.


62-62: LGTM!

The modification of the GasConsumed() method in the SDKGasMeter struct to return gm.gm.Consumed() instead of gm.gm.Remaining() aligns with the objective of accurately reporting gas consumption.

The code changes are approved.


69-69: LGTM!

The modification of the GasConsumedToLimit() method in the SDKGasMeter struct to return gm.gm.Consumed() instead of gm.gm.Remaining() aligns with the objective of accurately reporting gas consumption.

The code changes are approved.

core/testing/gas/service_mocks.go (2)

103-109: LGTM!

The addition of the Consumed() method to the MockMeter struct enhances its functionality by facilitating testing scenarios where gas consumption needs to be tracked or verified.

The code changes are approved.


111-115: LGTM!

The addition of the Consumed() method to the MockMeterMockRecorder struct improves the testing capabilities by providing a clearer interface for tracking gas consumption and setting expectations in mock interactions.

The code changes are approved.

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 355f4d7 and 4d7ebe5.

Files selected for processing (3)
  • core/gas/service.go (1 hunks)
  • core/testing/gas/service_mocks.go (1 hunks)
  • runtime/gas.go (2 hunks)
Additional context used
Path-based instructions (3)
core/gas/service.go (1)

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

runtime/gas.go (1)

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

core/testing/gas/service_mocks.go (1)

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

Additional comments not posted (6)
core/gas/service.go (1)

41-41: LGTM!

The Consumed method is correctly added to the Meter interface, enhancing its functionality.

The code changes are approved.

runtime/gas.go (3)

39-41: LGTM!

The Consumed method is correctly implemented in the CoreGasmeter struct, enhancing its functionality.

The code changes are approved.


62-62: LGTM!

The modification to call gm.gm.Consumed() instead of gm.gm.Remaining() correctly aligns the method with the new logic, ensuring consistency in gas consumption reporting.

The code changes are approved.


69-69: LGTM!

The modification to call gm.gm.Consumed() instead of gm.gm.Remaining() correctly aligns the method with the new logic, ensuring consistency in gas consumption reporting.

The code changes are approved.

core/testing/gas/service_mocks.go (2)

103-109: LGTM!

The Consumed method is correctly implemented in the MockMeter struct, enhancing its mocking capabilities.

The code changes are approved.


111-115: LGTM!

The Consumed method is correctly implemented in the MockMeterMockRecorder struct, enhancing its mocking capabilities.

The code changes are approved.

@sontrinh16 sontrinh16 added this pull request to the merge queue Aug 29, 2024
Merged via the queue into main with commit 41a9af7 Aug 29, 2024
75 checks passed
@sontrinh16 sontrinh16 deleted the son/fix_incorrect_consumed_gas branch August 29, 2024 15:21
mergify bot pushed a commit that referenced this pull request Aug 29, 2024
(cherry picked from commit 41a9af7)

# Conflicts:
#	core/gas/service.go
#	core/testing/gas/service_mocks.go
julienrbrt added a commit that referenced this pull request Aug 29, 2024
Co-authored-by: son trinh <trinhleson2000@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
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 C:core/testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: SDKGasMeter.GasConsumedToLimit returns incorrect values
3 participants