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.

Sign up for GitHub

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

Jump to bottom

x/epochs: osmocli tests migrate #3661

Merged
merged 3 commits into from
Dec 13, 2022
Merged

x/epochs: osmocli tests migrate #3661

merged 3 commits into from
Dec 13, 2022

Conversation

pysel
Copy link
Member

@pysel pysel commented Dec 8, 2022 •
edited
Loading

x/epochs test osmocli

@github-actions github-actions bot added C:CLI C:x/epochs C:x/gamm Changes, features and bugs related to the gamm module. C:x/incentives C:x/lockup C:x/pool-incentives labels Dec 8, 2022
@pysel pysel changed the title x/epochs: cli tests migrate x/epochs: osmocli tests migrate Dec 8, 2022
@pysel pysel changed the base branch from dev/osmocli_test_fix to main December 8, 2022 08:12
@pysel pysel changed the base branch from main to dev/osmocli_test_fix December 8, 2022 08:12
@pysel pysel force-pushed the ruslan/cli_tests_migrate branch from 5543840 to 463d5fa Compare December 8, 2022 08:16
@github-actions github-actions bot removed C:x/lockup C:x/pool-incentives C:x/incentives C:x/gamm Changes, features and bugs related to the gamm module. labels Dec 8, 2022
@pysel pysel mentioned this pull request Dec 9, 2022
Merged
Base automatically changed from dev/osmocli_test_fix to main December 12, 2022 17:55
ValarDragon
ValarDragon approved these changes Dec 13, 2022
View reviewed changes
Copy link
Member

@ValarDragon ValarDragon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks! Nice job

@ValarDragon ValarDragon added V:state/compatible/backport State machine compatible PR, should be backported A:backport/v13.x backport patches to v13.x branch labels Dec 13, 2022
@ValarDragon
Copy link
Member

To fix the branching, can you do

git checkout main
git pull
git checkout ruslan/cli_tests_migrate
git rebase -i main

And then in that interactive shell menu, change every pick to d (except the final 3 which are your commits)

@pysel pysel force-pushed the ruslan/cli_tests_migrate branch from 463d5fa to 0df7daa Compare December 13, 2022 04:51
@pysel
Copy link
Member Author

pysel commented Dec 13, 2022

Thank you @ValarDragon, rebased

@ValarDragon ValarDragon merged commit cab11fa into main Dec 13, 2022
@ValarDragon ValarDragon deleted the ruslan/cli_tests_migrate branch December 13, 2022 15:30
@mergify mergify bot mentioned this pull request Dec 13, 2022
Merged
mergify bot pushed a commit that referenced this pull request Dec 13, 2022
@pysel @mergify
x/epochs: osmocli tests migrate (#3661)
2a4b8ca 
* change query getters

* osmocli tests for epochs

* address Long

Co-authored-by: Ruslan Akhtariev <ruslanakhtariev@Ruslans-MacBook-Air.local>
(cherry picked from commit cab11fa)
ValarDragon pushed a commit that referenced this pull request Dec 13, 2022
@mergify @pysel
x/epochs: osmocli tests migrate (#3661) (#3699)
970792c 
* change query getters

* osmocli tests for epochs

* address Long

Co-authored-by: Ruslan Akhtariev <ruslanakhtariev@Ruslans-MacBook-Air.local>
(cherry picked from commit cab11fa)

Co-authored-by: Ruslan Akhtariev <46343690+RusAkh@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ValarDragon ValarDragon ValarDragon approved these changes

Assignees
No one assigned
Labels
A:backport/v13.x backport patches to v13.x branch C:CLI C:x/epochs V:state/compatible/backport State machine compatible PR, should be backported
Projects
Osmosis Chain Development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pysel @ValarDragon