Update after rebasing

Author: kronosapiens

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);
@@ -79,16 +78,12 @@ contract("EvaluatedExpenditure", (accounts) => {
 
     it("can install the extension with the extension manager", async () => {
       ({ colony } = await setupRandomColony(colonyNetwork));
-      await colony.installExtension(EVALUATED_EXPENDITURE, evaluatedExpenditureVersion, { from: USER0 });
-
-      await checkErrorRevert(
-        colony.installExtension(EVALUATED_EXPENDITURE, evaluatedExpenditureVersion, { from: USER0 }),
-        "colony-network-extension-already-installed"
-      );
+      const tx = await colony.installExtension(EVALUATED_EXPENDITURE, evaluatedExpenditureVersion);
 
-      await checkErrorRevert(colony.uninstallExtension(EVALUATED_EXPENDITURE, { from: USER1 }), "ds-auth-unauthorized");
+      const evaluatedExpenditureAddress = getExtensionAddressFromTx(tx);
+      await checkErrorRevert(colony.methods["uninstallExtension(address)"](evaluatedExpenditureAddress, { from: USER1 }), "ds-auth-unauthorized");
 
-      await colony.uninstallExtension(EVALUATED_EXPENDITURE, { from: USER0 });
+      await colony.methods["uninstallExtension(address)"](evaluatedExpenditureAddress, { from: USER0 });
     });
   });
 

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 () => {