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

Refactor lock method (backport #1936) #2029

Merged
merged 4 commits into from
Jul 12, 2022
Merged

Refactor lock method (backport #1936) #2029

merged 4 commits into from
Jul 12, 2022

Commits on Jul 12, 2022

  1. Refactor lock method (#1936) 

    * Add lock method refactor

* Delete duplciated testing

* Update x/lockup/keeper/lock.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Add tests implement feedback from code review

* Add test cases

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit c115593)

# Conflicts:
#	x/lockup/keeper/admin_keeper_test.go
#	x/lockup/keeper/lock.go
    @mattverse @mergify
    mattverse authored and mergify[bot] committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    f24bf7e View commit details
    Browse the repository at this point in the history

  2. Fix merge conflict

    @mattverse
    mattverse committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    0922c7a View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict

    @mattverse
    mattverse committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    197e7f0 View commit details
    Browse the repository at this point in the history

  4. Merge

    @mattverse
    mattverse committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    3afef8d View commit details
    Browse the repository at this point in the history