Refactor SpokePool inheritance structure #53
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicholaspai
reviewed
Feb 25, 2022
contracts/SpokePool.sol
Outdated
| bool enabled | ||
| ) internal { | ||
| ) public override onlyAdmin nonReentrant { | ||
| _requireAdminSender(); |
Member
There was a problem hiding this comment.
Why call both _requireAdminSender() and use the onlyAdmin modifier aren't these redundant?
Contributor
Author
There was a problem hiding this comment.
Yes! That's a mistake.
nicholaspai
reviewed
Feb 25, 2022
contracts/SpokePool.sol
Outdated
|
|
||
| function _setDepositQuoteTimeBuffer(uint32 _depositQuoteTimeBuffer) internal { | ||
| function setDepositQuoteTimeBuffer(uint32 _depositQuoteTimeBuffer) public override onlyAdmin nonReentrant { | ||
| _requireAdminSender(); |
Member
There was a problem hiding this comment.
nicholaspai
reviewed
Feb 25, 2022
contracts/SpokePool.sol
Outdated
| // Once this method is executed and a distribution root is stored in this contract, then `distributeRootBundle` | ||
| // can be called to execute each leaf in the root. | ||
| function relayRootBundle(bytes32 relayerRefundRoot, bytes32 slowRelayRoot) public override onlyAdmin nonReentrant { | ||
| _requireAdminSender(); |
Member
There was a problem hiding this comment.
nicholaspai
approved these changes
Feb 25, 2022
Member
nicholaspai
left a comment
nicholaspai
left a comment
There was a problem hiding this comment.
Really like this pattern but I think you have some redundant calls
Contributor
Author
Agreed. Thank you for pointing these out. I originally was just going to do a method call, then I moved to a modifier. Forgot to clean up the old calls. |
nicholaspai
approved these changes
Feb 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is mostly just simplifying. It allows the same logic to be performed but with fewer overridden methods in each SpokePool implementation and more of the implementation work done in the base class. There is also a unified modifier that all SpokePool implementations should use to gate admin functions:
onlyAdmin.