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

5
test/ownership/CanReclaimToken.test.js
View File

@ -1,7 +1,7 @@
const { expectThrow } = require('../helpers/expectThrow');
const CanReclaimToken = artifacts.require('CanReclaimToken');
const BasicTokenMock = artifacts.require('BasicTokenMock');
const StandardTokenMock = artifacts.require('StandardTokenMock');
contract('CanReclaimToken', function ([_, owner, anyone]) {
let token = null;
@ -9,8 +9,9 @@ contract('CanReclaimToken', function ([_, owner, anyone]) {
beforeEach(async function () {
// Create contract and token
token = await BasicTokenMock.new(owner, 100, { from: owner });
token = await StandardTokenMock.new(owner, 100, { from: owner });
canReclaimToken = await CanReclaimToken.new({ from: owner });
// Force token into contract
await token.transfer(canReclaimToken.address, 10, { from: owner });
const startBalance = await token.balanceOf(canReclaimToken.address);