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(CL): replace 6 return values in CreatePosition with a struct (backport #5983) #5988

Merged
merged 1 commit into from
Aug 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2023

This is an automatic backport of pull request #5983 done by Mergify.
Cherry-pick of 86f0c00 has failed:

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

You are currently cherry-picking commit 86f0c00f.
  (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:   x/concentrated-liquidity/bench_test.go
	modified:   x/concentrated-liquidity/fuzz_test.go
	modified:   x/concentrated-liquidity/incentives_test.go
	modified:   x/concentrated-liquidity/keeper_test.go
	modified:   x/concentrated-liquidity/lp_test.go
	modified:   x/concentrated-liquidity/pool_test.go
	modified:   x/concentrated-liquidity/range_test.go
	modified:   x/concentrated-liquidity/spread_rewards_test.go
	modified:   x/concentrated-liquidity/swaps_tick_cross_test.go
	modified:   x/concentrated-liquidity/tick_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/concentrated-liquidity/lp.go
	both modified:   x/concentrated-liquidity/msg_server.go
	both modified:   x/concentrated-liquidity/position.go
	both modified:   x/concentrated-liquidity/position_test.go
	both modified:   x/concentrated-liquidity/swaps_test.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

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

devbot fix

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

dev-bot fix

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

devbot help

@devbot-wizard
Copy link
Collaborator

Hi! I'm DevBot, a bot that helps with common tasks in the development process. Commands:

  • devbot fix: Fix basic errors in the PR. (e.g. imports, changelog conflicts, go mod conflicts)
  • devbot merge base: Merge the base branch into the PR branch.
  • devbot add changelog [misc/feat/api/sec] [message]: Add a changelog entry to the PR. (e.g. devbot add changelog feat Added a new feature)
    • If message is blank, defaults to PR title.
  • devbot re-pr: Re-PR the PR, useful for external contributors where we have no edit perms.

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

devbot fix

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

@ValarDragon is it supposed to fix CHANHELOG conflicts here? Unsure why nothing happens

@p0mvn
Copy link
Member

p0mvn commented Aug 8, 2023

devbot re-pr

@ValarDragon
Copy link
Member

ValarDragon commented Aug 8, 2023

huh, devbot fix should've fixed the changelog conflict.

EDIT: Ah interesting, it was failing due to a go imports issue. Ok going to make this command a bit more resilient to internal fails. I'll make devbot reply when theres an internal error

@ValarDragon
Copy link
Member

devbot fix

@p0mvn p0mvn force-pushed the mergify/bp/v16.x/pr-5983 branch from f51f83d to 6d26e12 Compare August 9, 2023 13:57
@ValarDragon ValarDragon merged commit b38ffb5 into v16.x Aug 9, 2023
@ValarDragon ValarDragon deleted the mergify/bp/v16.x/pr-5983 branch August 9, 2023 22:17
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.

3 participants