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: use cosmossdk.io/errors (backport #5065) #5069

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2023

This is an automatic backport of pull request #5065 done by Mergify.
Cherry-pick of 560224f has failed:

On branch mergify/bp/v15.x/pr-5065
Your branch is up to date with 'origin/v15.x'.

You are currently cherry-picking commit 560224f5.
  (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:   osmoutils/go.sum
	modified:   wasmbinding/message_plugin.go
	modified:   wasmbinding/query_plugin.go
	modified:   x/gamm/keeper/grpc_query.go
	modified:   x/gamm/keeper/grpc_query_test.go
	modified:   x/gamm/keeper/pool.go
	modified:   x/gamm/keeper/pool_service.go
	modified:   x/gamm/keeper/swap.go
	modified:   x/gamm/pool-models/balancer/amm.go
	modified:   x/gamm/pool-models/balancer/pool.go
	modified:   x/gamm/pool-models/balancer/pool_asset.go
	modified:   x/gamm/pool-models/balancer/pool_suite_test.go
	modified:   x/gamm/pool-models/internal/cfmm_common/lp.go
	modified:   x/gamm/pool-models/stableswap/msgs.go
	modified:   x/gamm/pool-models/stableswap/pool.go
	modified:   x/gamm/types/errors.go
	modified:   x/gamm/types/msgs.go
	modified:   x/ibc-hooks/types/errors.go
	modified:   x/ibc-hooks/wasm_hook.go
	modified:   x/ibc-rate-limit/ibc_module.go
	modified:   x/ibc-rate-limit/ics4_wrapper.go
	modified:   x/ibc-rate-limit/rate_limit.go
	modified:   x/ibc-rate-limit/types/errors.go
	modified:   x/incentives/keeper/gauge.go
	modified:   x/incentives/keeper/grpc_query.go
	modified:   x/incentives/keeper/msg_server.go
	modified:   x/lockup/keeper/grpc_query.go
	modified:   x/lockup/keeper/lock.go
	modified:   x/lockup/keeper/msg_server.go
	modified:   x/lockup/keeper/store.go
	modified:   x/lockup/types/errors.go
	modified:   x/lockup/types/msgs.go
	modified:   x/mint/keeper/keeper.go
	modified:   x/mint/keeper/keeper_test.go
	modified:   x/mint/types/errors.go
	modified:   x/pool-incentives/handler.go
	modified:   x/pool-incentives/keeper/distr.go
	modified:   x/poolmanager/types/msgs.go
	modified:   x/protorev/proposal_handler.go
	modified:   x/protorev/types/msg.go
	modified:   x/superfluid/keeper/grpc_query.go
	modified:   x/superfluid/keeper/stake.go
	modified:   x/superfluid/proposal_handler.go
	modified:   x/superfluid/types/errors.go
	modified:   x/tokenfactory/types/denoms.go
	modified:   x/tokenfactory/types/genesis.go
	modified:   x/txfees/handler.go
	modified:   x/txfees/keeper/feedecorator.go
	modified:   x/txfees/keeper/feetokens.go
	modified:   x/txfees/keeper/grpc_query.go
	modified:   x/txfees/types/errors.go
	modified:   x/valset-pref/types/msgs.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/params/config.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/go.mod
	both modified:   osmoutils/go.mod
	deleted by us:   tests/cl-genesis-positions/go.mod
	deleted by us:   tests/cl-go-client/go.mod
	deleted by us:   tests/cl-go-client/go.sum
	deleted by us:   x/concentrated-liquidity/incentives_test.go
	deleted by us:   x/cosmwasmpool/model/msgs.go
	deleted by us:   x/epochs/go.mod
	deleted by us:   x/epochs/go.sum
	deleted by us:   x/gamm/handler.go
	deleted by us:   x/gamm/keeper/migrate_test.go
	both modified:   x/gamm/pool-models/balancer/msgs.go
	both modified:   x/ibc-hooks/go.mod
	both modified:   x/ibc-hooks/go.sum
	both modified:   x/pool-incentives/types/errors.go
	deleted by us:   x/superfluid/keeper/migrate_test.go
	both modified:   x/superfluid/keeper/stake_test.go
	both modified:   x/superfluid/keeper/superfluid_asset_store.go
	both modified:   x/superfluid/types/msgs.go
	deleted by us:   x/tokenfactory/keeper/before_send.go
	both modified:   x/tokenfactory/types/errors.go
	both modified:   x/tokenfactory/types/msgs.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

* use cosmossdk.io/errors

* update changelog

* fix links so they don't violate no-bare-url

(cherry picked from commit 560224f)

# Conflicts:
#	CHANGELOG.md
#	app/params/config.go
#	go.mod
#	go.sum
#	osmomath/go.mod
#	osmoutils/go.mod
#	tests/cl-genesis-positions/go.mod
#	tests/cl-go-client/go.mod
#	tests/cl-go-client/go.sum
#	x/concentrated-liquidity/incentives_test.go
#	x/cosmwasmpool/model/msgs.go
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/gamm/handler.go
#	x/gamm/keeper/migrate_test.go
#	x/gamm/pool-models/balancer/msgs.go
#	x/ibc-hooks/go.mod
#	x/ibc-hooks/go.sum
#	x/pool-incentives/types/errors.go
#	x/superfluid/keeper/migrate_test.go
#	x/superfluid/keeper/stake_test.go
#	x/superfluid/keeper/superfluid_asset_store.go
#	x/superfluid/types/msgs.go
#	x/tokenfactory/keeper/before_send.go
#	x/tokenfactory/types/errors.go
#	x/tokenfactory/types/msgs.go
@p0mvn
Copy link
Member

p0mvn commented May 3, 2023

Let's not backport this. I rememeber there were state-break concerns stemming from sdk errors so would like to avoid having them in v15

@p0mvn p0mvn closed this May 3, 2023
@mergify mergify bot deleted the mergify/bp/v15.x/pr-5065 branch May 3, 2023 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants