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

Test improvisation for Superfluid (backport #1070) #1087

Merged
merged 3 commits into from
Mar 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2022

This is an automatic backport of pull request #1070 done by Mergify.
Cherry-pick of 00b4b2c has failed:

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

You are currently cherry-picking commit 00b4b2c.
  (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/test_suite.go
	modified:   proto/osmosis/incentives/gauge.proto
	modified:   x/incentives/types/gauge.pb.go
	modified:   x/superfluid/keeper/distribution_test.go
	modified:   x/superfluid/keeper/intermediary_account_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/superfluid/keeper/hooks_test.go
	both modified:   x/superfluid/keeper/keeper_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

* add utility for SetupGammPoolsAndSuperfluidAssets

* remove hardcoded gamm pool denoms

* fix for main branch ctx => Ctx, app => App in tests

* Test Changes

* Add testing packages

* Delete fmt

* Fix lint

* Remove multiple pacakges for apptesting

* Add parameter for reward allocation

* Improvements on test

Co-authored-by: antstalepresh <stalepresh121@outlook.com>
(cherry picked from commit 00b4b2c)

# Conflicts:
#	x/superfluid/keeper/hooks_test.go
#	x/superfluid/keeper/keeper_test.go
@mergify mergify bot added the conflicts label Mar 14, 2022
@codecov-commenter
Copy link

codecov-commenter commented Mar 14, 2022

Codecov Report

Merging #1087 (d68e473) into v7.x (86bafe3) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             v7.x    #1087   +/-   ##
=======================================
  Coverage   20.63%   20.63%           
=======================================
  Files         193      193           
  Lines       25264    25264           
=======================================
  Hits         5214     5214           
  Misses      19095    19095           
  Partials      955      955           
Impacted Files Coverage Δ
x/incentives/types/gauge.pb.go 0.62% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 86bafe3...d68e473. Read the comment docs.

@mattverse mattverse merged commit 77b1b7e into v7.x Mar 14, 2022
@mattverse mattverse deleted the mergify/bp/v7.x/pr-1070 branch March 14, 2022 05:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants