Minor test edits

Author: kronosapiens

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

@@ -193,7 +193,8 @@ contract("Colony Network Recovery", (accounts) => {
       await checkErrorRevert(colonyNetwork.claimMiningReward(ADDRESS_ZERO), "colony-in-recovery-mode");
       await checkErrorRevert(colonyNetwork.startTokenAuction(ADDRESS_ZERO), "colony-in-recovery-mode");
       await checkErrorRevert(colonyNetwork.bridgeSkill(1), "colony-in-recovery-mode");
-      await checkErrorRevert(colonyNetwork.appendReputationUpdateLogFromBridge(ADDRESS_ZERO, ADDRESS_ZERO, 0, 0, 0), "colony-in-recovery-mode");
+      await checkErrorRevert(colonyNetwork.bridgeReputationUpdateLog(ADDRESS_ZERO, 0, 0), "colony-in-recovery-mode");
+      await checkErrorRevert(colonyNetwork.addReputationUpdateLogFromBridge(ADDRESS_ZERO, ADDRESS_ZERO, 0, 0, 0), "colony-in-recovery-mode");
       await checkErrorRevert(colonyNetwork.bridgePendingReputationUpdate(ADDRESS_ZERO, 0), "colony-in-recovery-mode");
       await checkErrorRevert(colonyNetwork.addPendingReputationUpdate(0, ADDRESS_ZERO), "colony-in-recovery-mode");
 

test/contracts-network/colony-network.js

@@ -498,12 +498,13 @@ contract("Colony Network", (accounts) => {
   describe("when managing ENS names", () => {
     const orbitDBAddress = "QmPFtHi3cmfZerxtH9ySLdzpg1yFhocYDZgEZywdUXHxFU/my-db-name";
     let ensRegistry;
-
     let suffix;
 
     before(async () => {
       if (await isXdai()) {
         suffix = "colonyxdai";
+      } else {
+        suffix = "eth";
       }
     });
 

test/cross-chain/cross-chain.js

@@ -112,29 +112,26 @@ contract("Cross-chain", (accounts) => {
     // we see it in our tests that's the coverage chain, which builds the contract artifacts
     // in to a different location. If we see another chain id, we assume it's non-coverage
     // truffle and look for the build artifacts in the normal place.
-    if (process.env.SOLIDITY_COVERAGE && process.env.TRUFFLE_FOREIGN === "false") {
+    if (process.env.SOLIDITY_COVERAGE) {
       etherRouterInfo = JSON.parse(fs.readFileSync("./build-coverage/contracts/EtherRouter.json"));
     } else {
       etherRouterInfo = JSON.parse(fs.readFileSync("./build/contracts/EtherRouter.json"));
     }
-    const homeEtherRouterAddress = etherRouterInfo.networks[homeNetworkId.toString()].address;
-    homeColonyNetwork = await new ethers.Contract(homeEtherRouterAddress, IColonyNetwork.abi, ethersHomeSigner);
 
-    if (process.env.SOLIDITY_COVERAGE && process.env.TRUFFLE_FOREIGN === "true") {
-      etherRouterInfo = JSON.parse(fs.readFileSync("./build-coverage/contracts/EtherRouter.json"));
-    } else {
-      etherRouterInfo = JSON.parse(fs.readFileSync("./build/contracts/EtherRouter.json"));
-    }
+    const homeEtherRouterAddress = etherRouterInfo.networks[homeNetworkId.toString()].address;
     const foreignEtherRouterAddress = etherRouterInfo.networks[foreignNetworkId.toString()].address;
-    foreignColonyNetwork = await new ethers.Contract(foreignEtherRouterAddress, IColonyNetwork.abi, ethersForeignSigner);
 
-    console.log("foreign colony network", foreignColonyNetwork.address);
-    console.log("home colony network", homeColonyNetwork.address);
+    homeColonyNetwork = new ethers.Contract(homeEtherRouterAddress, IColonyNetwork.abi, ethersHomeSigner);
+    foreignColonyNetwork = new ethers.Contract(foreignEtherRouterAddress, IColonyNetwork.abi, ethersForeignSigner);
+
+    console.log("Foreign colony network", foreignColonyNetwork.address);
+    console.log("Home colony network", homeColonyNetwork.address);
+
+    const foreignMetaColonyAddress = await foreignColonyNetwork.getMetaColony();
+    const homeMetaColonyAddress = await homeColonyNetwork.getMetaColony();
 
-    const foreignMCAddress = await foreignColonyNetwork.getMetaColony();
-    foreignMetacolony = await new ethers.Contract(foreignMCAddress, IMetaColony.abi, ethersForeignSigner);
-    const homeMCAddress = await homeColonyNetwork.getMetaColony();
-    homeMetacolony = await new ethers.Contract(homeMCAddress, IMetaColony.abi, ethersHomeSigner);
+    foreignMetacolony = new ethers.Contract(foreignMetaColonyAddress, IMetaColony.abi, ethersForeignSigner);
+    homeMetacolony = new ethers.Contract(homeMetaColonyAddress, IMetaColony.abi, ethersHomeSigner);
 
     // The code here demonstrates how to generate the bridge data for a bridge. We work out the transaction (with dummy data), and then
     // the transaction that would call that on the AMB, before snipping out the AMB call. The non-dummy data is worked out on-chain before