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

Osmocli: Fix lines of code overhead + speed of CLI tests (backport #3647) #3694

Merged
merged 2 commits into from
Dec 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2022

This is an automatic backport of pull request #3647 done by Mergify.
Cherry-pick of 1986ad2 has failed:

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

You are currently cherry-picking commit 1986ad22.
  (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:   CHANGELOG.md
	new file:   osmoutils/osmocli/cli_tester.go
	modified:   osmoutils/osmocli/query_cmd_wrap.go
	modified:   osmoutils/osmocli/tx_cmd_wrap.go
	modified:   x/gamm/client/cli/cli_test.go
	modified:   x/gamm/client/cli/flags.go
	modified:   x/gamm/client/cli/query.go
	modified:   x/gamm/client/cli/tx.go
	deleted:    x/gamm/client/testutil/test_helpers.go
	modified:   x/incentives/client/cli/cli_test.go
	modified:   x/incentives/client/cli/query.go
	modified:   x/lockup/client/cli/cli_test.go
	modified:   x/lockup/client/cli/query.go
	deleted:    x/lockup/client/cli/query_test.go
	modified:   x/lockup/client/cli/tx.go
	deleted:    x/lockup/client/testutil/test_helpers.go
	deleted:    x/pool-incentives/client/cli/cli_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   osmoutils/cli_helpers.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

* Initial commit for cli test fixing

* Finish replacing tx tests

* Start query modification for testability

* Testing scaffolding now in place

* sync

* Fix cobra not resetting flag values

* Delete more cli tests

* Migrate incentives modules tests

* WIP on gamm deletion

* Finish converting all gamm tx tests

* Cleanup gamm index command

* pflag -> flag (alias, not import)

* Delete tests for 0-arg fns

* Convert simple query tests

* Finish adapting gamm tests

* Changelog

* Delete test suite that was never being ran

(cherry picked from commit 1986ad2)

# Conflicts:
#	osmoutils/cli_helpers.go
@mergify mergify bot added the conflicts label Dec 12, 2022
@github-actions github-actions bot added C:CLI C:x/gamm Changes, features and bugs related to the gamm module. C:x/incentives C:x/lockup C:x/pool-incentives labels Dec 12, 2022
@ValarDragon ValarDragon merged commit 8ac4f27 into v13.x Dec 13, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3647 branch December 13, 2022 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant