diff --git a/test/token/ETokenExplicitSender.events.js b/test/token/ETokenExplicitSender.events.js index 07fed64..849f5e4 100644 --- a/test/token/ETokenExplicitSender.events.js +++ b/test/token/ETokenExplicitSender.events.js @@ -1,6 +1,6 @@ const utils = require('./../utils.js'); module.exports = utils.makeEventMap({ - finalizeUpgrade: (contract, senderAddr) => [{ + finalizeUpgrade: (contract) => [{ eventName: 'UpgradeFinalized', paramMap: { upgradedFrom: contract} }] }); diff --git a/test/token/ETokenExplicitSender.test.js b/test/token/ETokenExplicitSender.test.js index de44f23..913948a 100644 --- a/test/token/ETokenExplicitSender.test.js +++ b/test/token/ETokenExplicitSender.test.js @@ -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'); }); @@ -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.