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

chore: deprecate legacy features on x/token,collection (backport #1201) #1202

Merged
merged 3 commits into from
Jan 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

This is an automatic backport of pull request #1201 done by Mergify.
Cherry-pick of 3babbe5 has failed:

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

You are currently cherry-picking commit 3babbe5f9.
  (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:   .golangci.yml
	modified:   Makefile
	modified:   baseapp/testutil/messages.pb.go
	modified:   docs/core/proto-docs.md
	modified:   proto/lbm/collection/v1/collection.proto
	modified:   proto/lbm/collection/v1/event.proto
	modified:   proto/lbm/collection/v1/genesis.proto
	modified:   proto/lbm/collection/v1/query.proto
	modified:   proto/lbm/collection/v1/tx.proto
	modified:   proto/lbm/token/v1/event.proto
	modified:   proto/lbm/token/v1/genesis.proto
	modified:   proto/lbm/token/v1/query.proto
	modified:   proto/lbm/token/v1/token.proto
	modified:   proto/lbm/token/v1/tx.proto
	modified:   tests/mocks/account_retriever.go
	modified:   tests/mocks/types_handler.go
	modified:   tests/mocks/types_invariant.go
	modified:   tests/mocks/types_router.go
	modified:   x/collection/collection.pb.go
	modified:   x/collection/event.pb.go
	modified:   x/collection/genesis.pb.go
	modified:   x/collection/query.pb.go
	modified:   x/collection/tx.pb.go
	modified:   x/stakingplus/testutil/expected_keepers_mocks.go
	modified:   x/token/event.pb.go
	modified:   x/token/genesis.pb.go
	modified:   x/token/query.pb.go
	modified:   x/token/token.pb.go
	modified:   x/token/tx.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   tests/mocks/types_module_module.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Deprecate all the x/token features

* Deprecate x/collection fungible token features

* Deprecate x/collection attach features

* Update CHANGELOG.md

* Lint

* Apply feedbacks on the PR

(cherry picked from commit 3babbe5)

# Conflicts:
#	CHANGELOG.md
#	tests/mocks/types_module_module.go
@mergify mergify bot requested a review from tkxkd0159 as a code owner January 5, 2024 07:03
@mergify mergify bot added the conflicts label Jan 5, 2024
@0Tech 0Tech self-assigned this Jan 5, 2024
Copy link

codecov bot commented Jan 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/v0.48.x@acd1ec6). Click here to learn what that means.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                 @@
##             release/v0.48.x    #1202   +/-   ##
==================================================
  Coverage                   ?   69.78%           
==================================================
  Files                      ?      646           
  Lines                      ?    67495           
  Branches                   ?        0           
==================================================
  Hits                       ?    47099           
  Misses                     ?    18210           
  Partials                   ?     2186           

@0Tech 0Tech removed the conflicts label Jan 5, 2024
@0Tech 0Tech merged commit cb6669c into release/v0.48.x Jan 5, 2024
31 checks passed
@0Tech 0Tech deleted the mergify/bp/release/v0.48.x/pr-1201 branch January 5, 2024 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants