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: deprecated use of sdkerrors (backport #1788) #1819

Merged
merged 5 commits into from
Feb 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #1788 done by Mergify.
Cherry-pick of 37909a3 has failed:

On branch mergify/bp/release/v4.1.x/pr-1788
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit 37909a3.
  (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:   app/upgrades.go
	modified:   util/checkers/proposal.go
	modified:   x/ibctransfer/keeper/keeper.go
	modified:   x/incentive/msgs.go
	modified:   x/leverage/keeper/exchange_rate.go
	modified:   x/leverage/keeper/keeper.go
	modified:   x/leverage/keeper/token.go
	modified:   x/leverage/types/errors.go
	modified:   x/leverage/types/genesis.go
	modified:   x/leverage/types/msgs.go
	modified:   x/leverage/types/token.go
	modified:   x/oracle/keeper/historic_price.go
	modified:   x/oracle/keeper/keeper.go
	modified:   x/oracle/keeper/msg_server.go
	modified:   x/oracle/types/msgs.go
	modified:   x/oracle/types/msgs_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x/incentive/errors.go
	both modified:   x/leverage/keeper/oracle.go
	both modified:   x/oracle/types/errors.go
	deleted by us:   x/uibc/errors.go
	deleted by us:   x/uibc/msg.go
	deleted by us:   x/uibc/quota/ibc_module.go
	deleted by us:   x/uibc/quota/keeper/quota.go
	deleted by us:   x/uibc/quota/keeper/relay.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

## Description

Fixes golangci-lint complains about usage of deprecated function

(cherry picked from commit 37909a3)

# Conflicts:
#	x/incentive/errors.go
#	x/leverage/keeper/oracle.go
#	x/oracle/types/errors.go
#	x/uibc/errors.go
#	x/uibc/msg.go
#	x/uibc/quota/ibc_module.go
#	x/uibc/quota/keeper/quota.go
#	x/uibc/quota/keeper/relay.go
@mergify mergify bot requested review from a team as code owners February 14, 2023 04:22
@mergify mergify bot added the conflicts label Feb 14, 2023
x/incentive/errors.go Outdated Show resolved Hide resolved
Copy link
Member

@toteki toteki left a comment

Choose a reason for hiding this comment

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

Should hopefully remove some of the linter problems from the other backports, so they're easier to doublecheck.

@toteki toteki merged commit 5cc2c0c into release/v4.1.x Feb 14, 2023
@toteki toteki deleted the mergify/bp/release/v4.1.x/pr-1788 branch February 14, 2023 05:00
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.

2 participants