From 56d1f4af0b09a25e798506081f422e613c601a26 Mon Sep 17 00:00:00 2001 From: Daniel Kronovet Date: Tue, 27 Jul 2021 14:35:23 -0700 Subject: [PATCH] Update after rebasing --- test/extensions/evaluated-expenditures.js | 7 +++---- test/extensions/voting-rep.js | 12 +++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/test/extensions/evaluated-expenditures.js b/test/extensions/evaluated-expenditures.js index 7bebe12aee..36d79df6b2 100644 --- a/test/extensions/evaluated-expenditures.js +++ b/test/extensions/evaluated-expenditures.js @@ -7,7 +7,7 @@ import { soliditySha3 } from "web3-utils"; import { UINT256_MAX, WAD } from "../../helpers/constants"; import { setupEtherRouter } from "../../helpers/upgradable-contracts"; -import { checkErrorRevert, web3GetCode } from "../../helpers/test-helper"; +import { checkErrorRevert, web3GetCode, getExtensionAddressFromTx } from "../../helpers/test-helper"; import { setupColonyNetwork, setupRandomColony, setupMetaColonyWithLockedCLNYToken } from "../../helpers/test-data-generator"; const { expect } = chai; @@ -46,9 +46,8 @@ contract("EvaluatedExpenditure", (accounts) => { beforeEach(async () => { ({ colony } = await setupRandomColony(colonyNetwork)); - await colony.installExtension(EVALUATED_EXPENDITURE, evaluatedExpenditureVersion); - - const evaluatedExpenditureAddress = await colonyNetwork.getExtensionInstallation(EVALUATED_EXPENDITURE, colony.address); + const tx = await colony.installExtension(EVALUATED_EXPENDITURE, evaluatedExpenditureVersion); + const evaluatedExpenditureAddress = getExtensionAddressFromTx(tx); evaluatedExpenditure = await EvaluatedExpenditure.at(evaluatedExpenditureAddress); await colony.setArbitrationRole(1, UINT256_MAX, evaluatedExpenditure.address, 1, true); diff --git a/test/extensions/voting-rep.js b/test/extensions/voting-rep.js index 420f67faaf..6cd1814b32 100644 --- a/test/extensions/voting-rep.js +++ b/test/extensions/voting-rep.js @@ -1232,9 +1232,6 @@ contract("Voting Reputation", (accounts) => { }); it("can take an action to install an extension", async () => { - let installation = await colonyNetwork.getExtensionInstallation(soliditySha3("OneTxPayment"), colony.address); - expect(installation).to.be.equal(ADDRESS_ZERO); - const oneTxPaymentImplementation = await OneTxPayment.new(); const resolver = await Resolver.new(); await setupEtherRouter("OneTxPayment", { OneTxPayment: oneTxPaymentImplementation.address }, resolver); @@ -1250,11 +1247,12 @@ contract("Voting Reputation", (accounts) => { await forwardTime(STAKE_PERIOD, this); - const { logs } = await voting.finalizeMotion(motionId); - expect(logs[1].args.executed).to.be.true; + const tx = await voting.finalizeMotion(motionId); + expect(tx.logs[1].args.executed).to.be.true; - installation = await colonyNetwork.getExtensionInstallation(soliditySha3("OneTxPayment"), colony.address); - expect(installation).to.not.be.equal(ADDRESS_ZERO); + const extensionAddress = getExtensionAddressFromTx(tx); + const colonyAddress = await colonyNetwork.getExtensionMultiInstallation(extensionAddress); + expect(colonyAddress).to.equal(colony.address); }); it("can take an action with an arbitrary target", async () => {