Feature/pool 132 implement sponsorship #40
Merged
Conversation
This file contains 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
…t methods to accept data & operatorData
…ooltogether/pooltogether-pool-contracts into feature/pool-132-implement-sponsorship
asselstine
requested changes
Jun 18, 2020
| import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol"; | ||
|
|
||
| interface CTokenInterface is IERC20 { | ||
| function totalSupply() external override view returns (uint256); |
There was a problem hiding this comment.
IERC20 also has a totalSupply() so this has to be "override"
| function underlying() external view returns (address); | ||
| function balanceOfUnderlying(address owner) external returns (uint256); | ||
| function supplyRatePerBlock() external returns (uint256); | ||
| function exchangeRateCurrent() external returns (uint256); | ||
| function mint(uint256 mintAmount) external returns (uint256); | ||
| function balanceOf(address user) external view returns (uint256); | ||
| function balanceOf(address user) external override view returns (uint256); |
There was a problem hiding this comment.
IERC20 also has a balanceOf() so this has to be "override"
contracts/token/ControlledToken.sol
Outdated
| _burn(_user, _amount, data, operatorData); | ||
| } | ||
|
|
||
| // function burn(uint256 amount, bytes memory data) public override { |
There was a problem hiding this comment.
ERC777 has a public "burn" method but it cannot be overridden (not marked virtual)
package.json
Outdated
| @@ -11,7 +11,7 @@ | |||
| "test": "buidler test", | |||
| "compile": "buidler --show-stack-traces --max-memory 8192 compile", | |||
| "start": "buidler node --port $LOCAL_BUIDLEREVM_PORT", | |||
| "coverage": "rm -rf build cache test-results.xml && buidler compile && buidler coverage --network coverage --temp build; rm -rf cache", | |||
| "coverage": "rm -rf build cache test-results.xml && buidler compile && buidler coverage --network coverage --temp build", | |||
There was a problem hiding this comment.
keep the ; rm -rf cache as the coverage doesn't seem to clean up after itself
There was a problem hiding this comment.
Fixed, but I didn't remove this.
| }) | ||
| }) | ||
|
|
||
| describe('setTokens()', () => { |
There was a problem hiding this comment.
Maybe just add a test to ensure this can't be called twice (for the pesky require conditional)
asselstine
approved these changes
Jun 19, 2020
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.
No description provided.