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

Redeem and Unstake after RevertStake #753

Merged
merged 8 commits into from
May 27, 2019

Conversation

abhayks1
Copy link
Contributor

Fixes #738

@jasonklein jasonklein self-assigned this May 23, 2019
Copy link
Contributor

@jasonklein jasonklein left a comment

Choose a reason for hiding this comment

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

Mostly looks good to me. My comments are small and largely track the ones I made in #747.

I see there are two different approaches taken in these test files: (a) its for each major step in the process and (b) one it for the whole integrated flow. I prefer the integrated flow approach here, but I nevertheless note the inconsistency and think that a ticket to bring the test files in alignment would be 🌟(cc: @deepesh-kn).

Also: as discussed offline, this PR and #747 both introduce a file (and class), revert_redeem_assertion.js that are not identical—these changes should be aligned.

@jasonklein jasonklein removed their assignment May 23, 2019
@abhayks1 abhayks1 self-assigned this May 27, 2019
@abhayks1
Copy link
Contributor Author

Working on the review feedback ⏩

- Renamed the test file
- Use cogateway.penalty function
@abhayks1
Copy link
Contributor Author

Ready for review again 🚀

@abhayks1 abhayks1 removed their assignment May 27, 2019
@abhayks1
Copy link
Contributor Author

Resolving conflicts ⏰ 😿

@abhayks1 abhayks1 self-assigned this May 27, 2019
…edeem_declared

# Conflicts:
#	test_integration/03_redeem_and_unstake/utils/revert_redeem_assertion.js
@abhayks1 abhayks1 removed their assignment May 27, 2019
@abhayks1
Copy link
Contributor Author

Conflicts resolved ⛑
Ready for review again 💯

@0xsarvesh 0xsarvesh self-assigned this May 27, 2019
Copy link
Contributor

@0xsarvesh 0xsarvesh left a comment

Choose a reason for hiding this comment

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

LGTM 🎢

@0xsarvesh 0xsarvesh dismissed jasonklein’s stale review May 27, 2019 15:12

Verified the requested changes.

@0xsarvesh 0xsarvesh merged commit 05d3c13 into OpenST:develop May 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integration test: Progress redeem and unstake when revert redeem declared.
3 participants