OpenZeppelin / openzeppelin-solidity / 2235 / 2

66%

master: 66%

push

travis-ci

Consolidated ERC20 Interface and Implementation Files (#1125)

* Consolidted ERC20 Interface and Implementation Files

* Fixed CanReclaimToken's tests to use StandardTokenMock instead of BasicTokenMock

* Changed token's variable type in TokenTimelock to ERC20

* Merged the StandardBurnableToken with BurnableToken since it now inherits from StandardToken; Fixed TokenTimelock so it uses SafeERC20 for ERC20

* Fixed variable type for _token in TokenTimelock constructor

* Fixed linting warning in BurnableToken

* Added back burnFrom tests.

209 of 244 branches covered (85.66%)

Branch coverage included in aggregate %.

525 of 532 relevant lines covered (98.68%)

89.18 hits per line