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

MN-588: update migration procedure #65

Merged
merged 3 commits into from
Aug 26, 2020
Merged

MN-588: update migration procedure #65

merged 3 commits into from
Aug 26, 2020

Conversation

uhzxl
Copy link
Contributor

@uhzxl uhzxl commented Aug 13, 2020

- What I did
Injected linear deposit creation into migration procedure
- How I did it

  • Added deposit.createAdditionalDeposit method that creates linear deposit
  • Added call of createAdditionalDeposit when enough confirmations have been collected
  • Added corresponding test changes to TestDepositMigration test to check that additional deposit created and created from "Public Allocation 2" fund
  • Skipped TestDepositCreate test because it becomes impossible to create test users of the old type (with only one deposit)
  • Made changes in sdk.go and launchnet.go to simulate actual fund reallocation
  • And finally made changes in fund_test.go according to fund reallocation

- How to verify it
Run func tests

- Description for the changelog

@uhzxl uhzxl requested a review from LinnikD as a code owner August 13, 2020 12:26
@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2020 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (MN-574-2@4345e97). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             MN-574-2      #65   +/-   ##
===========================================
  Coverage            ?   14.23%           
===========================================
  Files               ?        7           
  Lines               ?     1124           
  Branches            ?        0           
===========================================
  Hits                ?      160           
  Misses              ?      951           
  Partials            ?       13

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 4345e97...e287b60. Read the comment docs.

@uhzxl uhzxl requested review from megge-dream and Hirama and removed request for Tsovak August 26, 2020 07:12
megge-dream
megge-dream suggested changes Aug 26, 2020
View reviewed changes
application/functest/test_utils.go Outdated Show resolved Hide resolved
@uhzxl @megge-dream
Update application/functest/test_utils.go
e287b60 
Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>
@uhzxl uhzxl requested a review from megge-dream August 26, 2020 10:10
@uhzxl uhzxl merged commit 07cbd2c into MN-574-2 Aug 26, 2020
@uhzxl uhzxl deleted the MN-588-migration-in-2-deposits branch August 26, 2020 14:44
pavlushev added a commit that referenced this pull request Sep 3, 2020
@uhzxl @pavlushev
@megge-dream @MikhailPopov @Hirama
MN-574-2 (#74)
dbc9e6c 
* MN-581: create method deposit.transferToDeposit

* MN-581: create method deposit.transferToDeposit

* MN-591: add `deposit.createFund` method (#39)

* PENV-346: add hash to full pulse

* MN-591: add `deposit.createFund` method

* MN-591: refactor method names and remove redundant constructor parameter

* MN-591: switch to master

* MN-591: cleanup after rebase

Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>

* MN-581: create method deposit.transferToDeposit

* resolve conflict

* resolve conflict

* MN-636: add method `account.transferToDeposit` (#42)

* MN-636: add method `account.transferToDeposit`

* MN-636: rename `TransferToDeposit` to `ReallocateToDeposit`

* MN-636: add balance checks to functest

* MN-584: add linear vesting type (#47)

* MN-583: add method `deposit.create` (#53)

* MN-651: split spec files (#46)

* MN-651: split spec files

* MN-651: return temporary admin methods in api-exported.yaml

* MN-651: reset api-exported.yaml to v1.1.1 (#48)

* MN-662: fix TestMigrationDaemonTransferDeposit

* MN-662: fix TransferDeposit tests

* MN-583: add method `deposit.create`

* MN-583: revert fund_test.go

* MN-583: fix typo in daemon_confirm.go name

* MN-583: comply note about error text checking

* MN-583: fix parameters order for compatibility with observer

* MN-583: fix note about error type assertion

Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>

* MN-583: add double deposit creation check (#57)

* NOISSUE: clarify deposit.Confirm (#58)

* NOISSUE: clarify deposit.Confirm

* NOISSUE: remove unnecessary confusing test

* NOISSUE: fix note about toAmounts method

* MN-588: update migration procedure (#65)

* MN-588: update migration procedure

* MN-588: skip TestDepositCreate

* Update application/functest/test_utils.go

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

* MN-652: calculate available amount for additional deposit (#70)

* MN-589: utility app

* MN-751: fill linear vesting params from default vesting params config (#73)

Co-authored-by: Andrey Pavlushev <andrey.pavlushev@insolar.io>
Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>
Co-authored-by: Andrey Pavlushev <pavlushev@users.noreply.github.com>
Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>
Co-authored-by: Andrey Zolin <crrrr@mail.ru>
pavlushev added a commit that referenced this pull request Oct 16, 2020
@pavlushev @uhzxl
@megge-dream @MikhailPopov @Hirama @pavel-moskovkin @sdmironov @Tsovak
NOISSUE: release/1.11-> release/1.12 (#87)
f3aa5ba 
* MN-574-2 (#74)

* MN-581: create method deposit.transferToDeposit

* MN-581: create method deposit.transferToDeposit

* MN-591: add `deposit.createFund` method (#39)

* PENV-346: add hash to full pulse

* MN-591: add `deposit.createFund` method

* MN-591: refactor method names and remove redundant constructor parameter

* MN-591: switch to master

* MN-591: cleanup after rebase

Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>

* MN-581: create method deposit.transferToDeposit

* resolve conflict

* resolve conflict

* MN-636: add method `account.transferToDeposit` (#42)

* MN-636: add method `account.transferToDeposit`

* MN-636: rename `TransferToDeposit` to `ReallocateToDeposit`

* MN-636: add balance checks to functest

* MN-584: add linear vesting type (#47)

* MN-583: add method `deposit.create` (#53)

* MN-651: split spec files (#46)

* MN-651: split spec files

* MN-651: return temporary admin methods in api-exported.yaml

* MN-651: reset api-exported.yaml to v1.1.1 (#48)

* MN-662: fix TestMigrationDaemonTransferDeposit

* MN-662: fix TransferDeposit tests

* MN-583: add method `deposit.create`

* MN-583: revert fund_test.go

* MN-583: fix typo in daemon_confirm.go name

* MN-583: comply note about error text checking

* MN-583: fix parameters order for compatibility with observer

* MN-583: fix note about error type assertion

Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>

* MN-583: add double deposit creation check (#57)

* NOISSUE: clarify deposit.Confirm (#58)

* NOISSUE: clarify deposit.Confirm

* NOISSUE: remove unnecessary confusing test

* NOISSUE: fix note about toAmounts method

* MN-588: update migration procedure (#65)

* MN-588: update migration procedure

* MN-588: skip TestDepositCreate

* Update application/functest/test_utils.go

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

* MN-652: calculate available amount for additional deposit (#70)

* MN-589: utility app

* MN-751: fill linear vesting params from default vesting params config (#73)

Co-authored-by: Andrey Pavlushev <andrey.pavlushev@insolar.io>
Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>
Co-authored-by: Andrey Pavlushev <pavlushev@users.noreply.github.com>
Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>
Co-authored-by: Andrey Zolin <crrrr@mail.ru>

* MN-740: add insolar v1.8.0 with an exporter API rate limiter

* MN-761: use TransferToDeposit request reference as txID (#76)

* MN-740: add fixed insolar v1.8.1

* Revert "MN-761: use TransferToDeposit request reference as txID (#76)" (#77)

This reverts commit 90a2e08.

* Revert "MN-574-2 (#74)" (#78)

This reverts commit dbc9e6c.

* MN-771: add the insolar v1.8.2 with an optional rate-limiting

* OPS-354 run e2e tests on pull requests (#82)

* OPS-354 e2e

* OPS-354 move overlay to gotops

* OPS-354 debug

* OPS-354: add private registry secret to pull go-autotest image

* OPS-354: fix private registry secret

* OPS-354 download go-test-parser.zip

* OPS-354 fix execute binary

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 Download go-test-parser and execute

* OPS-354 provide BUILD_VERSION to fix the autotest

* OPS-354 fix quote

* empty commit

* OPS-354 proper path to autotests

* OPS-354 update gitops branch to REL-57

* OPS-354 rename package to 'autotests-pod'

* OPS-354 update go-autotests branch to master

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 revert step condition

Co-authored-by: Sergei Mironov <sergei.mironov@insolar.io>

Co-authored-by: Alexey Zhunin <zhunin.a.u@gmail.com>
Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>
Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>
Co-authored-by: Andrey Zolin <crrrr@mail.ru>
Co-authored-by: Mikhail Popov <53470434+MikhailPopov@users.noreply.github.com>
Co-authored-by: Pavel Moskovkin <34027831+pavel-moskovkin@users.noreply.github.com>
Co-authored-by: Sergei Mironov <sergei.mironov@insolar.io>
Co-authored-by: Tsovak Sahakyan <tsovak@bk.ru>
pavlushev added a commit that referenced this pull request Oct 16, 2020
@MikhailPopov @uhzxl
@pavlushev @megge-dream @Hirama @pavel-moskovkin @sdmironov
PENV-680: remove vendor, update go (#83)
580deef 
* MN-574-2 (#74)

* MN-581: create method deposit.transferToDeposit

* MN-581: create method deposit.transferToDeposit

* MN-591: add `deposit.createFund` method (#39)

* PENV-346: add hash to full pulse

* MN-591: add `deposit.createFund` method

* MN-591: refactor method names and remove redundant constructor parameter

* MN-591: switch to master

* MN-591: cleanup after rebase

Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>

* MN-581: create method deposit.transferToDeposit

* resolve conflict

* resolve conflict

* MN-636: add method `account.transferToDeposit` (#42)

* MN-636: add method `account.transferToDeposit`

* MN-636: rename `TransferToDeposit` to `ReallocateToDeposit`

* MN-636: add balance checks to functest

* MN-584: add linear vesting type (#47)

* MN-583: add method `deposit.create` (#53)

* MN-651: split spec files (#46)

* MN-651: split spec files

* MN-651: return temporary admin methods in api-exported.yaml

* MN-651: reset api-exported.yaml to v1.1.1 (#48)

* MN-662: fix TestMigrationDaemonTransferDeposit

* MN-662: fix TransferDeposit tests

* MN-583: add method `deposit.create`

* MN-583: revert fund_test.go

* MN-583: fix typo in daemon_confirm.go name

* MN-583: comply note about error text checking

* MN-583: fix parameters order for compatibility with observer

* MN-583: fix note about error type assertion

Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>

* MN-583: add double deposit creation check (#57)

* NOISSUE: clarify deposit.Confirm (#58)

* NOISSUE: clarify deposit.Confirm

* NOISSUE: remove unnecessary confusing test

* NOISSUE: fix note about toAmounts method

* MN-588: update migration procedure (#65)

* MN-588: update migration procedure

* MN-588: skip TestDepositCreate

* Update application/functest/test_utils.go

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

Co-authored-by: Zubareva Maria <maria.zubareva@insolar.io>

* MN-652: calculate available amount for additional deposit (#70)

* MN-589: utility app

* MN-751: fill linear vesting params from default vesting params config (#73)

Co-authored-by: Andrey Pavlushev <andrey.pavlushev@insolar.io>
Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>
Co-authored-by: Andrey Pavlushev <pavlushev@users.noreply.github.com>
Co-authored-by: Mikhail Popov <mikhail.popov@insolar.io>
Co-authored-by: Andrey Zolin <crrrr@mail.ru>

* MN-740: add insolar v1.8.0 with an exporter API rate limiter

* MN-761: use TransferToDeposit request reference as txID (#76)

* MN-740: add fixed insolar v1.8.1

* Revert "MN-761: use TransferToDeposit request reference as txID (#76)" (#77)

This reverts commit 90a2e08.

* Revert "MN-574-2 (#74)" (#78)

This reverts commit dbc9e6c.

* MN-771: add the insolar v1.8.2 with an optional rate-limiting

* OPS-354 run e2e tests on pull requests (#82)

* OPS-354 e2e

* OPS-354 move overlay to gotops

* OPS-354 debug

* OPS-354: add private registry secret to pull go-autotest image

* OPS-354: fix private registry secret

* OPS-354 download go-test-parser.zip

* OPS-354 fix execute binary

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 fix execute binary

* OPS-354 tmp

* OPS-354 Download go-test-parser and execute

* OPS-354 provide BUILD_VERSION to fix the autotest

* OPS-354 fix quote

* empty commit

* OPS-354 proper path to autotests

* OPS-354 update gitops branch to REL-57

* OPS-354 rename package to 'autotests-pod'

* OPS-354 update go-autotests branch to master

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 go-test-parser v1.0.4 check

* OPS-354 revert step condition

Co-authored-by: Sergei Mironov <sergei.mironov@insolar.io>

* PENV-680: remove vendor, update go

* change application structure

* merge

* add burnedAccount

* add burnedAccount

* merge

* merge

* merge

* fix ugorji library

* insolar-scripts revert

Co-authored-by: Alexey Zhunin <zhunin.a.u@gmail.com>
Co-authored-by: Andrey Pavlushev <andrey.pavlushev@insolar.io>
Co-authored-by: Maria Zubareva <maria.zubareva@insolar.io>
Co-authored-by: Andrey Pavlushev <pavlushev@users.noreply.github.com>
Co-authored-by: Andrey Zolin <crrrr@mail.ru>
Co-authored-by: Pavel Moskovkin <34027831+pavel-moskovkin@users.noreply.github.com>
Co-authored-by: Sergei Mironov <sergei.mironov@insolar.io>
Co-authored-by: pavel-moskovkin <you@example.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hirama Hirama Hirama approved these changes

@megge-dream megge-dream megge-dream approved these changes

@LinnikD LinnikD LinnikD approved these changes

@dmitry-shidlovsky dmitry-shidlovsky dmitry-shidlovsky approved these changes

@pavlushev pavlushev pavlushev approved these changes

@SergeyRadist SergeyRadist SergeyRadist approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@uhzxl @codecov-commenter @Hirama @megge-dream @LinnikD @dmitry-shidlovsky @pavlushev @SergeyRadist