NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidated ERC20 Interface and Implementation Files (#1125)

Browse Source 
* 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.
This commit is contained in:
Doug Crescenzi
2018-08-02 22:12:31 -04:00
committed by Francisco Giordano
parent 3d86c58d2c
commit ef347ffccc
22 changed files with 183 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/token/ERC20/BurnableToken.test.js
View File

@ -1,12 +1,12 @@
const { shouldBehaveLikeBurnableToken } = require('./BurnableToken.behaviour');
const BurnableTokenMock = artifacts.require('BurnableTokenMock');
contract('BurnableToken', function ([_, owner]) {
contract('BurnableToken', function ([_, owner, ...otherAccounts]) {
const initialBalance = 1000;
beforeEach(async function () {
this.token = await BurnableTokenMock.new(owner, initialBalance, { from: owner });
});
shouldBehaveLikeBurnableToken(owner, initialBalance);
shouldBehaveLikeBurnableToken(owner, initialBalance, otherAccounts);
});