Skip to content

Commit

Permalink
Fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Maasdamind committed Jan 27, 2019
1 parent ecfb186 commit 69d6f96
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion test/token/ETokenExplicitSender.events.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const utils = require('./../utils.js');

module.exports = utils.makeEventMap({
finalizeUpgrade: (contract, senderAddr) => [{
finalizeUpgrade: (contract) => [{
eventName: 'UpgradeFinalized',
paramMap: { upgradedFrom: contract} }] });
12 changes: 2 additions & 10 deletions test/token/ETokenExplicitSender.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,11 @@ contract('ETokenExplicitSender', function ([owner, someAddress, ...rest]) {
storage = await ExternalERC20Storage.new({ from: owner });
});

it('reverts when no upgradeFrom contract is set', async function () {
const token = await ETokenExplicitSender.new('tok', 't', 10,
accesslist.address, true, storage.address,
0, true, { from: owner });
await util.assertRevertsReason(token.finalizeUpgrade({ from: someAddress }),
'Must have a contract to upgrade from');
});

it('reverts when wrong contract finalizes upgrade', async function () {
const token = await ETokenExplicitSender.new('tok', 't', 10,
accesslist.address, true, storage.address,
0xf00f, false, { from: owner });
await util.assertRevertsReason(token.finalizeUpgrade({ from: someAddress }),
await util.assertReverts(token.finalizeUpgrade({ from: someAddress }),
'Sender is not old contract');
});

Expand All @@ -49,7 +41,7 @@ contract('ETokenExplicitSender', function ([owner, someAddress, ...rest]) {

const tokenE = ETokenExplicitSenderE.wrap(token);

await tokenE.finalizeUpgrade(owner, owner, { from: owner });
await tokenE.finalizeUpgrade(owner, { from: owner });
});
});
// Remainder of contract tested through EToken.
Expand Down

0 comments on commit 69d6f96

Please sign in to comment.