Make skill bridging on colony creation more reliable in tests

Author: area

scripts/mockBridgeMonitor.js

@@ -82,8 +82,9 @@ class MockBridgeMonitor {
 
   close() {} // eslint-disable-line class-methods-use-this
 
-  async bridgeSkipped() {
-    const [bridge, messageId, encodedData] = this.skipped.shift();
+  async bridgeSkipped(id = 0) {
+    // remove the id'th element from the array
+    const [bridge, messageId, encodedData] = this.skipped.splice(id, 1)[0];
     const [target, data, gasLimit, sender] = ethers.utils.defaultAbiCoder.decode(["address", "bytes", "uint256", "address"], encodedData);
     const tx = await bridge.execute(target, data, gasLimit, messageId, sender);
     await tx.wait();

test/cross-chain/cross-chain.js

@@ -249,14 +249,21 @@ contract("Cross-chain", (accounts) => {
   }
 
   beforeEach(async () => {
-    const tx = await foreignBridge.setBridgeEnabled(true);
+    let tx = await foreignBridge.setBridgeEnabled(true);
     await tx.wait();
     // Set up a colony on the home chain. That may or may not be the truffle chain...
     homeColony = await setupColony(homeColonyNetwork);
-
     const p = bridgeMonitor.getPromiseForNextBridgedTransaction(2);
     foreignColony = await setupColony(foreignColonyNetwork);
     await p;
+
+    // It's possible these were bridged out of order, so check, and if so, bridge the second skill
+    const bridgedSkillCount = await homeColonyNetwork.getBridgedSkillCounts(foreignChainId);
+    const skillCount = await foreignColonyNetwork.getSkillCount();
+    if (!bridgedSkillCount.eq(skillCount)) {
+      tx = await homeColonyNetwork.addPendingSkill(homeBridge.address, skillCount, { gasLimit: 1000000 });
+      await tx.wait();
+    }
   });
 
   afterEach(async () => {
@@ -790,7 +797,13 @@ contract("Cross-chain", (accounts) => {
       let p = bridgeMonitor.getPromiseForNextBridgedTransaction(2);
       const foreignColony2 = await setupColony(foreignColonyNetwork);
       await p;
-
+      // It's possible these were bridged out of order, so check, and if so, bridge the second skill
+      const bridgedSkillCount = await homeColonyNetwork.getBridgedSkillCounts(foreignChainId);
+      const skillCount = await foreignColonyNetwork.getSkillCount();
+      if (!bridgedSkillCount.eq(skillCount)) {
+        const tx = await homeColonyNetwork.addPendingSkill(homeBridge.address, skillCount, { gasLimit: 1000000 });
+        await tx.wait();
+      }
       let tx = await foreignBridge.setBridgeEnabled(false);
       await tx.wait();
       tx = await foreignColony.emitDomainReputationReward(1, accounts[0], "0x1338");
@@ -846,6 +859,14 @@ contract("Cross-chain", (accounts) => {
       const foreignColony2 = await setupColony(foreignColonyNetwork);
       await p;
 
+      // It's possible these were bridged out of order, so check, and if so, bridge the second skill
+      const bridgedSkillCount = await homeColonyNetwork.getBridgedSkillCounts(foreignChainId);
+      const skillCount = await foreignColonyNetwork.getSkillCount();
+      if (!bridgedSkillCount.eq(skillCount)) {
+        const tx = await homeColonyNetwork.addPendingSkill(homeBridge.address, skillCount, { gasLimit: 1000000 });
+        await tx.wait();
+      }
+
       bridgeMonitor.skipCount = 1;
 
       // Bridge skills