-
Notifications
You must be signed in to change notification settings - Fork 31
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
Remove cogateway deactivation logic #518
Remove cogateway deactivation logic #518
Conversation
@sarvesh-ost can you please merge develop and resolve the conflicts before we review it? |
It's now available for review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🐘💨 Nice one!
Only two minor things...
contracts/gateway/EIP20Gateway.sol
Outdated
@@ -197,6 +200,17 @@ contract EIP20Gateway is GatewayBase { | |||
/** Maps messageHash to the Unstake object. */ | |||
mapping(bytes32 /*messageHash*/ => Unstake) unstakes; | |||
|
|||
/* modifiers */ | |||
|
|||
/** checks that contract is activated */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/** checks that contract is activated */ | |
/** Checks that contract is active. */ |
|
||
await _setup(accounts, gateway); | ||
await _prepareData(); | ||
await _stake(utils.ResultType.FAIL); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is the gateway activated in the other test cases? 😕
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now we have the ability to activate.
So we can now delete TestEIP20Gateway
contract.
Previously it was the part of linking process.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the mock contract, it has been set to true
on construction.
Link
…_deactivation_logic
…com/sarvesh-ost/mosaic-contracts into remove_cogateway_deactivation_logic
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Few inline comments.
|
||
await _setup(accounts, gateway); | ||
await _prepareData(); | ||
await _stake(utils.ResultType.FAIL); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now we have the ability to activate.
So we can now delete TestEIP20Gateway
contract.
Previously it was the part of linking process.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🙌
This should be merged after #512
Removed deactivation logic from
GatewayBase
and now only gateway and co-gateway can be deactivated. Also, the stake can only be called if the gateway is activated.