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: CL apptesting helpers for SQS (backport #6822) #6865

Merged
merged 4 commits into from
Nov 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2023

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

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

You are currently cherry-picking commit 3ac77873.
  (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/apptesting/concentrated_liquidity.go
	modified:   app/apptesting/pool_manager.go
	modified:   x/concentrated-liquidity/fuzz_test.go
	modified:   x/concentrated-liquidity/incentives_test.go
	modified:   x/concentrated-liquidity/invariant_test.go
	modified:   x/concentrated-liquidity/position_test.go
	modified:   x/concentrated-liquidity/range_test.go
	modified:   x/concentrated-liquidity/spread_rewards_test.go
	modified:   x/concentrated-liquidity/tick_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/concentrated-liquidity/keeper_test.go
	both modified:   x/concentrated-liquidity/lp_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

Closes: #XXX

## What is the purpose of the change

This PR moves CL test helpers into the `apptesting` package so that these heleprs can be reused in SQS.

This is partial transfer of #6785 where the CL apptesting suite is already in-use

(cherry picked from commit 3ac7787)

# Conflicts:
#	x/concentrated-liquidity/keeper_test.go
#	x/concentrated-liquidity/lp_test.go
#	x/concentrated-liquidity/swaps_test.go
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had any recent activity. It will be closed if no further activity occurs. Thank you!

@github-actions github-actions bot added the Stale label Nov 26, 2023
@github-actions github-actions bot removed the Stale label Nov 30, 2023
@p0mvn p0mvn merged commit a77e482 into v20.x Nov 30, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v20.x/pr-6822 branch November 30, 2023 01:02
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