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

adapt contracts for upgradeability

Browse Source
This commit is contained in:
Francisco Giordano
2018-04-18 18:10:26 -03:00
parent 89c32f5dd7
commit f9fc8d2e96
17 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/ownership/Ownable.test.js
View File

@ -8,6 +8,7 @@ contract('Ownable', function (accounts) {
beforeEach(async function () {
ownable = await Ownable.new();
await ownable.initialize(accounts[0]);
});
it('should have an owner', async function () {

3
test/token/ERC20/MintableToken.test.js
View File

@ -3,7 +3,8 @@ const MintableToken = artifacts.require('MintableToken');
contract('Mintable', function ([owner, anotherAccount]) {
beforeEach(async function () {
this.token = await MintableToken.new({ from: owner });
this.token = await MintableToken.new();
await this.token.initialize(owner);
});
describe('minting finished', function () {

6
test/token/ERC20/TokenTimelock.test.js
View File

@ -15,9 +15,11 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) {
const amount = new BigNumber(100);
beforeEach(async function () {
this.token = await MintableToken.new({ from: owner });
this.token = await MintableToken.new();
await this.token.initialize(owner);
this.releaseTime = latestTime() + duration.years(1);
this.timelock = await TokenTimelock.new(this.token.address, beneficiary, this.releaseTime);
this.timelock = await TokenTimelock.new();
await this.timelock.initialize(this.token.address, beneficiary, this.releaseTime);
await this.token.mint(this.timelock.address, amount, { from: owner });
});

6
test/token/ERC20/TokenVesting.test.js
View File

@ -16,13 +16,15 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {
const amount = new BigNumber(1000);
beforeEach(async function () {
this.token = await MintableToken.new({ from: owner });
this.token = await MintableToken.new();
await this.token.initialize(owner);
this.start = latestTime() + duration.minutes(1); // +1 minute so it starts after contract instantiation
this.cliff = duration.years(1);
this.duration = duration.years(2);
this.vesting = await TokenVesting.new(beneficiary, this.start, this.cliff, this.duration, true, { from: owner });
this.vesting = await TokenVesting.new();
await this.vesting.initialize(owner, beneficiary, this.start, this.cliff, this.duration, true);
await this.token.mint(this.vesting.address, amount, { from: owner });
});