Some polishing

Author: area

contracts/colony/ColonyFunding.sol

@@ -131,8 +131,7 @@ contract ColonyFunding is
 
     uint256 fundingPotId = domains[_domainId].fundingPotId;
     uint256 approvedAmount = domainReputationApproval[_domainId];
-
-    if (tokenEarnsReputationOnPayout(_token)) {
+    if (tokenEarnsReputationOnPayout(_token) && _domainId > 1) {
       uint256 transferrableAmount = min(approvedAmount, remainder);
       uint256 untransferrableAmount = remainder - transferrableAmount;
 

contracts/colonyNetwork/ColonyNetworkDeployer.sol

@@ -203,7 +203,7 @@ contract ColonyNetworkDeployer is ColonyNetworkStorage {
 
       // Set up the deployed contract
       EtherRouter(payable(domainTokenReceiverAddress)).setResolver(domainReceiverResolverAddress);
-      DomainTokenReceiver(domainTokenReceiverAddress).setColonyAddress(msgSender());
+      DomainTokenReceiver(domainTokenReceiverAddress).setColony(msgSender());
     } else {
       // Contract is deployed, check it's got the right resolver
       try EtherRouter(payable(domainTokenReceiverAddress)).resolver() returns (Resolver resolver) {

contracts/common/DomainTokenReceiver.sol

@@ -30,11 +30,11 @@ contract DomainTokenReceiver is DSAuth {
     _;
   }
 
-  function getColonyAddress() public view returns (address) {
+  function getColony() public view returns (address) {
     return colony;
   }
 
-  function setColonyAddress(address _colony) public auth {
+  function setColony(address _colony) public {
     require(colony == address(0), "domain-token-receiver-colony-already-set");
     colony = _colony;
   }

test/contracts-network/colony-funding.js

@@ -668,6 +668,27 @@ contract("Colony Funding", (accounts) => {
       await checkErrorRevert(receiver.setColonyAddress(ADDRESS_ZERO, { from: colonyNetwork.address }), "domain-token-receiver-colony-already-set");
     });
 
+    it("can get the colony a domainTokenReceiver is associated with", async () => {
+      await colony.addDomain(1, UINT256_MAX, 1);
+      const receiverAddress = await colonyNetwork.getDomainTokenReceiverAddress(colony.address, 2);
+      await colony.claimDomainFunds(ethers.constants.AddressZero, 2);
+      const receiver = await DomainTokenReceiver.at(receiverAddress);
+
+      const associatedColony = await receiver.getColony();
+      expect(associatedColony).to.equal(colony.address);
+    });
+
+    it("when receiving native (reputation-earning) token, if being received by root domain, only DomainFundsClaimed event is emitted", async () => {
+      // Get address for domain 1
+      const receiverAddress = await colonyNetwork.getDomainTokenReceiverAddress(colony.address, 1);
+      const txData = token.contract.methods["mint(address,uint256)"](receiverAddress, 100).encodeABI();
+      await colony.makeArbitraryTransaction(token.address, txData);
+
+      const tx = await colony.claimDomainFunds(token.address, 1);
+      expect(tx.logs.filter((l) => l.event === "DomainFundsClaimed").length).to.equal(1);
+      expect(tx.logs.filter((l) => l.event === "ColonyFundsClaimed").length).to.equal(0);
+    });
+
     it("when receiving native (reputation-earning) token, if no approval present for domain, all are received by root domain", async () => {
       // Get address for domain 2
       await colony.addDomain(1, UINT256_MAX, 1);