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(simapp/v2): remove RunWithCtx (backport #21739) #21826

Merged
merged 4 commits into from
Sep 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024

Description

This resolves a TODO by removing stf.RunWithCtx. Instead some indirection with services is used to create a bespoke genesis context (with support for fewer services).

Tested so far with:

simdv2 start # from genesis
simdv2 genesis export

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 the InitGenesis function to provide a detailed state representation alongside error reporting.
    • Integrated default service bindings into the application's dependency injection configuration for improved service management.
  • Bug Fixes

    • Removed the RunWithCtx function to simplify the STF[T] struct interface and reduce potential confusion.
  • Chores

    • Redirected module paths to local versions for easier development and testing.

This is an automatic backport of pull request #21739 done by [Mergify](https://mergify.com).

(cherry picked from commit d6364b8)

# Conflicts:
#	core/header/service.go
#	core/store/service.go
#	runtime/v2/builder.go
#	runtime/v2/go.mod
#	runtime/v2/go.sum
#	runtime/v2/module.go
#	server/v2/appmanager/appmanager.go
#	server/v2/appmanager/genesis.go
#	server/v2/appmanager/types.go
#	server/v2/stf/stf.go
#	simapp/v2/go.mod
#	simapp/v2/go.sum
@mergify mergify bot requested a review from a team as a code owner September 19, 2024 21:46
@mergify mergify bot added the conflicts label Sep 19, 2024
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of d6364b8 has failed:

On branch mergify/bp/release/v0.52.x/pr-21739
Your branch is up to date with 'origin/release/v0.52.x'.

You are currently cherry-picking commit d6364b895.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   runtime/v2/services/genesis.go
	modified:   server/v2/cometbft/abci_test.go
	modified:   simapp/v2/app_di.go
	modified:   simapp/v2/simdv2/cmd/root_di.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   core/header/service.go
	deleted by us:   core/store/service.go
	deleted by us:   runtime/v2/builder.go
	deleted by us:   runtime/v2/go.mod
	deleted by us:   runtime/v2/go.sum
	deleted by us:   runtime/v2/module.go
	deleted by us:   server/v2/appmanager/appmanager.go
	deleted by us:   server/v2/appmanager/genesis.go
	deleted by us:   server/v2/appmanager/types.go
	deleted by us:   server/v2/stf/stf.go
	both modified:   simapp/v2/go.mod
	both modified:   simapp/v2/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor

coderabbitai bot commented Sep 19, 2024

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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.

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.

will fix the conflicts tomorrow

@julienrbrt julienrbrt marked this pull request as ready for review September 20, 2024 10:40
@julienrbrt julienrbrt changed the title refactor(stf): remove RunWithCtx (backport #21739) refactor(simapp/v2): remove RunWithCtx (backport #21739) Sep 20, 2024
@julienrbrt julienrbrt enabled auto-merge (squash) September 20, 2024 10:46
@julienrbrt julienrbrt merged commit 781d900 into release/v0.52.x Sep 20, 2024
71 of 73 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.52.x/pr-21739 branch September 20, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:server/v2 cometbft C:server/v2 Issues related to server/v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants