Skip to content

refactor(core,x/**): simplify core service api and embed environment in keepers#20071

Merged
julienrbrt merged 9 commits into
mainfrom
julien/refactor-env-core
Apr 17, 2024
Merged

refactor(core,x/**): simplify core service api and embed environment in keepers#20071
julienrbrt merged 9 commits into
mainfrom
julien/refactor-env-core

Conversation

@julienrbrt
Copy link
Copy Markdown
Contributor

Description

I started by simplifying core services naming (as discussed on Slack) and as I had to touch all usage of environment in keeper, I applied @kocubinski suggestion of embedding environment in keepers directly here.

  • Simplify core services naming (drop the Get)
  • Embed environment in keepers
  • Remove all Logger(ctx) / Logger() functions from keepers as now they are public from environment
  • Update ante handlers due to Environement() getter renaming
  • Ensure correct module name in logger at environment instantiation in runtime (TODO, do the same in server/v2)

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

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

@julienrbrt julienrbrt requested a review from a team April 17, 2024 09:39
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 17, 2024

Important

Auto Review Skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

58 files out of 115 files are above the max files limit of 50. Please upgrade to Pro plan to get higher limits.

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


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.

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 a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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.

Comment thread x/group/keeper/keeper.go
}

if err := k.proposalTable.Update(k.environment.KVStoreService.OpenKVStore(ctx), proposal.Id, &proposal); err != nil {
if err := k.proposalTable.Update(k.KVStoreService.OpenKVStore(ctx), proposal.Id, &proposal); err != nil {

Check failure

Code scanning / gosec

Implicit memory aliasing in for loop.

Implicit memory aliasing in for loop.
Comment thread x/group/keeper/keeper.go
//nolint:gosec // "implicit memory aliasing in the for loop (because of the pointer on &v)"
for _, v := range votes {
err = k.voteTable.Delete(k.environment.KVStoreService.OpenKVStore(ctx), &v)
err = k.voteTable.Delete(k.KVStoreService.OpenKVStore(ctx), &v)

Check failure

Code scanning / gosec

Implicit memory aliasing in for loop.

Implicit memory aliasing in for loop.
Comment thread x/group/keeper/keeper.go
proposalInfo.Status = group.PROPOSAL_STATUS_ABORTED

if err := k.proposalTable.Update(k.environment.KVStoreService.OpenKVStore(ctx), proposalInfo.Id, &proposalInfo); err != nil {
if err := k.proposalTable.Update(k.KVStoreService.OpenKVStore(ctx), proposalInfo.Id, &proposalInfo); err != nil {

Check failure

Code scanning / gosec

Implicit memory aliasing in for loop.

Implicit memory aliasing in for loop.
@julienrbrt julienrbrt enabled auto-merge April 17, 2024 09:55
Copy link
Copy Markdown
Contributor

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

left a few questions. The biggest change is losing module information in the logs. But it doesnt seem like this was consistent

}

func (*mockAccount) Environment() appmodule.Environment {
func (*mockAccount) GetEnvironment() appmodule.Environment {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

how come get here, but removed elsewhere?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is a method on the keeper, not a service. As we use an interface instead of the concrete type for ante handler, we need to obtain environment. It was just called Environement() before but now it clashes with the embedded environment on the auth struct.

Comment thread x/distribution/keeper/keeper.go
Comment thread x/distribution/keeper/migrations.go
@julienrbrt julienrbrt disabled auto-merge April 17, 2024 10:09
@julienrbrt
Copy link
Copy Markdown
Contributor Author

left a few questions. The biggest change is losing module information in the logs. But it doesnt seem like this was consistent

Yes, so the module name is gotten by depinject: https://github.com/cosmos/cosmos-sdk/pull/20071/files#diff-e58d72d17b7bd432b5a25c6277d603886f901a753261930bba47f5f47d706beeR263
Without depinject you do need to do this indeed: https://github.com/cosmos/cosmos-sdk/pull/20071/files#diff-f411a5009131db5a6c7242b49ca78488f2d274ef9e5e5f4de9262a42108a5386R175

Comment thread x/gov/keeper/abci.go
if errors.Is(err, collections.ErrEncoding) {
proposal.Id = prop.Key.K2()
if err := failUnsupportedProposal(logger, ctx, k, proposal, err.Error(), false); err != nil {
if err := failUnsupportedProposal(ctx, k, proposal, err.Error(), false); err != nil {

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods

path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call
Comment thread x/gov/keeper/abci.go
if errors.Is(err, collections.ErrEncoding) {
proposal.Id = prop.Key.K2()
if err := failUnsupportedProposal(logger, ctx, k, proposal, err.Error(), true); err != nil {
if err := failUnsupportedProposal(ctx, k, proposal, err.Error(), true); err != nil {

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods

path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call
Comment thread x/group/keeper/abci.go
// prunes expired proposals.
func (k Keeper) EndBlocker(ctx context.Context) error {
if err := k.TallyProposalsAtVPEnd(ctx, k.environment); err != nil {
if err := k.TallyProposalsAtVPEnd(ctx); err != nil {

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods

path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call
Comment thread x/group/keeper/abci.go
}

return k.PruneProposals(ctx, k.environment)
return k.PruneProposals(ctx)

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods

path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call path flow from Begin/EndBlock to a panic call
@julienrbrt julienrbrt enabled auto-merge April 17, 2024 11:18
@kocubinski
Copy link
Copy Markdown
Contributor

I think embedding Environment is an overall win in simplcity and readable, with the caveat that services are now exported fields. That being said, I think it's probably OK within a module; inter module we typically use a consumer side interface so exported fields aren't available.

Copy link
Copy Markdown
Contributor

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

will you modify app.go as part of this pr as well?

@julienrbrt
Copy link
Copy Markdown
Contributor Author

will you modify app.go as part of this pr as well?

sure can do 👍🏾

@julienrbrt julienrbrt requested a review from kocubinski April 17, 2024 15:23
@julienrbrt julienrbrt added this pull request to the merge queue Apr 17, 2024
Merged via the queue into main with commit 5e7aae0 Apr 17, 2024
@julienrbrt julienrbrt deleted the julien/refactor-env-core branch April 17, 2024 18:22
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.

4 participants