Improve coverage

Author: kronosapiens

contracts/extensions/CoinMachine.sol

@@ -210,7 +210,7 @@ contract CoinMachine is ColonyExtension, BasicMetaTransaction {
       "coin-machine-unauthorised"
     );
 
-    uint256 maxPurchase = getMaxPurchase(msg.sender);
+    uint256 maxPurchase = getMaxPurchase(msgSender());
     uint256 numTokens = min(maxPurchase, _numTokens);
     uint256 totalCost = wmul(numTokens, activePrice);
 
@@ -224,7 +224,7 @@ contract CoinMachine is ColonyExtension, BasicMetaTransaction {
     // Do userLimitFraction bookkeeping (only if needed)
     if (userLimitFraction < WAD) {
       soldTotal = add(soldTotal, numTokens);
-      soldUser[msg.sender] = add(soldUser[msg.sender], numTokens);
+      soldUser[msgSender()] = add(soldUser[msgSender()], numTokens);
     }
 
     // Check if we've sold out

contracts/extensions/EvaluatedExpenditure.sol

@@ -87,7 +87,7 @@ contract EvaluatedExpenditure is ColonyExtension, BasicMetaTransaction {
     public
   {
     require(_slots.length == _payoutModifiers.length, "evaluated-expenditure-bad-slots");
-    require(colony.getExpenditure(_id).owner == msg.sender, "evaluated-expenditure-not-owner");
+    require(colony.getExpenditure(_id).owner == msgSender(), "evaluated-expenditure-not-owner");
 
     bool[] memory mask = new bool[](2);
     bytes32[] memory keys = new bytes32[](2);

test/contracts-network/colony-network-extensions.js

@@ -8,9 +8,15 @@ import { soliditySha3 } from "web3-utils";
 
 import { checkErrorRevert, web3GetBalance, encodeTxData } from "../../helpers/test-helper";
 import { setupEtherRouter } from "../../helpers/upgradable-contracts";
-import { setupColonyNetwork, setupMetaColonyWithLockedCLNYToken, setupRandomColony } from "../../helpers/test-data-generator";
 import { UINT256_MAX } from "../../helpers/constants";
 
+import {
+  setupColonyNetwork,
+  setupMetaColonyWithLockedCLNYToken,
+  setupRandomColony,
+  getMetaTransactionParameters,
+} from "../../helpers/test-data-generator";
+
 const { expect } = chai;
 chai.use(bnChai(web3.utils.BN));
 
@@ -355,5 +361,24 @@ contract("Colony Network Extensions", (accounts) => {
       const action = await encodeTxData(tokenLocking, "unlockTokenForUser", [token.address, USER, lockId]);
       await checkErrorRevert(otherColonyExecuteCall.executeCall(tokenLocking.address, action), "colony-token-locking-not-locker");
     });
+
+    it("allows extensions to use metatransactions", async () => {
+      await metaColony.addExtensionToNetwork(TEST_EXTENSION, testExtension1Resolver.address);
+      await colony.installExtension(TEST_EXTENSION, 1, { from: ROOT });
+
+      const extensionAddress = await colonyNetwork.getExtensionInstallation(TEST_EXTENSION, colony.address);
+      const extension = await TestExtension1.at(extensionAddress);
+
+      let nonce;
+      nonce = await extension.getMetatransactionNonce(ROOT);
+      expect(nonce).to.be.zero;
+
+      const txData = await extension.contract.methods.foo().encodeABI();
+      const { r, s, v } = await getMetaTransactionParameters(txData, ROOT, extension.address);
+      await extension.executeMetaTransaction(ROOT, txData, r, s, v, { from: USER });
+
+      nonce = await extension.getMetatransactionNonce(ROOT);
+      expect(nonce).to.eq.BN(1);
+    });
   });
 });

test/extensions/evaluated-expenditures.js

@@ -8,7 +8,13 @@ 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 { setupColonyNetwork, setupRandomColony, setupMetaColonyWithLockedCLNYToken } from "../../helpers/test-data-generator";
+
+import {
+  setupColonyNetwork,
+  setupRandomColony,
+  setupMetaColonyWithLockedCLNYToken,
+  getMetaTransactionParameters,
+} from "../../helpers/test-data-generator";
 
 const { expect } = chai;
 chai.use(bnChai(web3.utils.BN));
@@ -127,5 +133,22 @@ contract("EvaluatedExpenditure", (accounts) => {
         "evaluated-expenditure-not-owner"
       );
     });
+
+    it("can set the payout modifier via metatransaction", async () => {
+      const txData = await evaluatedExpenditure.contract.methods
+        .setExpenditurePayoutModifiers(1, UINT256_MAX.toString(), expenditureId.toString(), [0], [WAD.toString()])
+        .encodeABI();
+
+      const { r, s, v } = await getMetaTransactionParameters(txData, USER0, evaluatedExpenditure.address);
+
+      let expenditureSlot;
+      expenditureSlot = await colony.getExpenditureSlot(expenditureId, 0);
+      expect(expenditureSlot.payoutModifier).to.be.zero;
+
+      await evaluatedExpenditure.executeMetaTransaction(USER0, txData, r, s, v, { from: USER1 });
+
+      expenditureSlot = await colony.getExpenditureSlot(expenditureId, 0);
+      expect(expenditureSlot.payoutModifier).to.eq.BN(WAD);
+    });
   });
 });