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(x/accounts/lockup): fix proto path (backport #22319) #22328

Open
wants to merge 1 commit into
base: release/v0.52.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2024

Description

noticed while reviewing #22254
import naming inconsistency between all account impls

Shall we use v1? or types? I'd actually suggest the later, as v1 feels weird, but this is what was done previously.


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 versioning for the lockup module, transitioning to lockupv1.
    • Enhanced documentation for the Cosmos SDK's account module, including detailed explanations of initialization and execution handlers.
  • Bug Fixes

    • Updated error messages and handling to reflect the new versioned structure.
  • Documentation

    • Clarified terminology and expanded sections on account creation, execution handlers, and query handlers in the README.
  • Chores

    • Updated import paths across various files to reflect the new versioning structure.

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

(cherry picked from commit 2711ece)

# Conflicts:
#	api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
#	api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
#	api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go
Copy link
Contributor Author

mergify bot commented Oct 21, 2024

Cherry-pick of 2711ece has failed:

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

You are currently cherry-picking commit 2711ecefc.
  (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:
	modified:   tests/e2e/accounts/lockup/continous_lockup_test_suite.go
	modified:   tests/e2e/accounts/lockup/delayed_lockup_test_suite.go
	modified:   tests/e2e/accounts/lockup/periodic_lockup_test_suite.go
	modified:   tests/e2e/accounts/lockup/permanent_lockup_test_suite.go
	modified:   tests/e2e/accounts/lockup/utils.go
	modified:   x/accounts/README.md
	modified:   x/accounts/defaults/lockup/continuous_locking_account.go
	modified:   x/accounts/defaults/lockup/continuous_locking_account_test.go
	modified:   x/accounts/defaults/lockup/delayed_locking_account.go
	modified:   x/accounts/defaults/lockup/delayed_locking_account_test.go
	modified:   x/accounts/defaults/lockup/lockup.go
	modified:   x/accounts/defaults/lockup/lockup_test.go
	modified:   x/accounts/defaults/lockup/periodic_locking_account.go
	modified:   x/accounts/defaults/lockup/periodic_locking_account_test.go
	modified:   x/accounts/defaults/lockup/permanent_locking_account.go
	modified:   x/accounts/defaults/lockup/permanent_locking_account_test.go
	renamed:    x/accounts/defaults/lockup/types/encoding.go -> x/accounts/defaults/lockup/v1/encoding.go
	renamed:    x/accounts/defaults/lockup/types/lockup.pb.go -> x/accounts/defaults/lockup/v1/lockup.pb.go
	renamed:    x/accounts/defaults/lockup/types/query.pb.go -> x/accounts/defaults/lockup/v1/query.pb.go
	renamed:    x/accounts/defaults/lockup/types/tx.pb.go -> x/accounts/defaults/lockup/v1/tx.pb.go
	renamed:    x/accounts/proto/cosmos/accounts/defaults/lockup/lockup.proto -> x/accounts/proto/cosmos/accounts/defaults/lockup/v1/lockup.proto
	renamed:    x/accounts/proto/cosmos/accounts/defaults/lockup/query.proto -> x/accounts/proto/cosmos/accounts/defaults/lockup/v1/query.proto
	renamed:    x/accounts/proto/cosmos/accounts/defaults/lockup/tx.proto -> x/accounts/proto/cosmos/accounts/defaults/lockup/v1/tx.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   api/cosmos/accounts/defaults/lockup/v1/lockup.pulsar.go
	deleted by us:   api/cosmos/accounts/defaults/lockup/v1/query.pulsar.go
	deleted by us:   api/cosmos/accounts/defaults/lockup/v1/tx.pulsar.go

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

@mergify[bot] your pull request is missing a changelog!

protoimpl "google.golang.org/protobuf/runtime/protoimpl"
durationpb "google.golang.org/protobuf/types/known/durationpb"
io "io"
reflect "reflect"

Check notice

Code scanning / CodeQL

Sensitive package import Note

Certain system packages contain functions which may be a possible source of non-determinism
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.

Todo:
rm -r api

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.

1 participant