Update tests for new restriction on confirmNewHash

JoinColony · Jan 14, 2022 · 4e8da0f · 4e8da0f
1 parent 6121b2c
commit 4e8da0f
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 134 deletions.
diff --git a/helpers/test-helper.js b/helpers/test-helper.js
@@ -621,6 +621,7 @@ export async function advanceMiningCycleNoContest({ colonyNetwork, client, miner
   if (client !== undefined) {
     await client.addLogContentsToReputationTree();
     await client.submitRootHash();
+    await client.confirmEntry();
   } else {
     const accounts = await web3GetAccounts();
     minerAddress = minerAddress || accounts[5]; // eslint-disable-line no-param-reassign
@@ -629,8 +630,8 @@ export async function advanceMiningCycleNoContest({ colonyNetwork, client, miner
     } catch (err) {
       console.log("advanceMiningCycleNoContest error thrown by .submitRootHash", err);
     }
+    await repCycle.confirmNewHash(0, { from: minerAddress });
   }
-  await repCycle.confirmNewHash(0, { from: minerAddress });
 }
 
 export async function accommodateChallengeAndInvalidateHashViaTimeout(colonyNetwork, test, client1) {
@@ -652,8 +653,10 @@ export async function accommodateChallengeAndInvalidateHashViaTimeout(colonyNetw
   await forwardTime(SUBMITTER_ONLY_WINDOW + 600, this);
 
   const toInvalidateIdx = idx1.mod(2).eq(1) ? idx1.sub(1) : idx1.add(1);
+  const accounts = await web3GetAccounts();
+  const minerAddress = accounts[5];
 
-  return repCycle.invalidateHash(round1, toInvalidateIdx);
+  return repCycle.invalidateHash(round1, toInvalidateIdx, { from: minerAddress });
 }
 
 export async function accommodateChallengeAndInvalidateHash(colonyNetwork, test, client1, client2, _errors) {
@@ -703,7 +706,8 @@ export async function accommodateChallengeAndInvalidateHash(colonyNetwork, test,
   }
   await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
 
-  return repCycle.invalidateHash(round1, toInvalidateIdx);
+  const signingAddress = await client1.realWallet.getAddress();
+  return repCycle.invalidateHash(round1, toInvalidateIdx, { from: signingAddress });
 }
 
 async function navigateChallenge(colonyNetwork, client1, client2, errors) {
@@ -825,7 +829,11 @@ export async function finishReputationMiningCycle(colonyNetwork, test) {
       const disputeRound = await repCycle.getDisputeRound(roundNumber);
       const timestamp = disputeRound[0].lastResponseTimestamp;
       await forwardTimeTo(parseInt(timestamp, 10) + MINING_CYCLE_DURATION, test);
-      await repCycle.confirmNewHash(roundNumber);
+
+      const accounts = await web3GetAccounts();
+      const minerAddress = accounts[5];
+
+      await repCycle.confirmNewHash(roundNumber, { from: minerAddress });
       // But for now, that's okay.
     } else {
       // We shouldn't get here. If this fires during a test, you haven't finished writing the test.

diff --git a/test-chainid/chainid-dependent-behaviour.js b/test-chainid/chainid-dependent-behaviour.js
@@ -113,12 +113,12 @@ contract("Contract Storage", (accounts) => {
 
       await forwardTime(MINING_CYCLE_DURATION / 2 + SUBMITTER_ONLY_WINDOW + MINING_CYCLE_TIMEOUT + 1, this);
 
-      await repCycle.invalidateHash(0, 0);
-      await repCycle.invalidateHash(0, 3);
+      await repCycle.invalidateHash(0, 0, { from: MINER1 });
+      await repCycle.invalidateHash(0, 3, { from: MINER1 });
 
       await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
       const networkBalanceBefore = await clnyToken.balanceOf(colonyNetwork.address);
-      const tx = await repCycle.confirmNewHash(1);
+      const tx = await repCycle.confirmNewHash(1, { from: MINER1 });
 
       if (chainId === XDAI || chainId === FORKED_XDAI) {
         // tokens should be paid from the network balance
@@ -155,7 +155,7 @@ contract("Contract Storage", (accounts) => {
       await repCycle.submitRootHash("0x12345678", 10, "0x00", 1, { from: MINER1 });
 
       await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
-      const tx = await repCycle.confirmNewHash(0);
+      const tx = await repCycle.confirmNewHash(0, { from: MINER1 });
       await expectNoEvent(tx, "Transfer(address indexed,address indexed,uint256)", [colonyNetwork.address, metaColony.address, 0]);
       await expectNoEvent(tx, "Burn(address indexed,uint256)", [colonyNetwork.address, 0]);
     });

diff --git a/test-gas-costs/gasCosts.js b/test-gas-costs/gasCosts.js
@@ -268,7 +268,7 @@ contract("All", function (accounts) {
       });
       const repCycle = await getActiveRepCycle(colonyNetwork);
       await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
-      await repCycle.confirmNewHash(2);
+      await repCycle.confirmNewHash(2, { from: STAKER1 });
 
       // withdraw
       const clnyToken = await metaColony.getToken();

diff --git a/test/contracts-network/reputation-basic-functionality.js b/test/contracts-network/reputation-basic-functionality.js
@@ -175,7 +175,7 @@ contract("Reputation mining - basic functionality", (accounts) => {
 
       // Cleanup
       await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
-      await repCycle.confirmNewHash(0);
+      await repCycle.confirmNewHash(0, { from: MINER1 });
     });
   });
 

diff --git a/test/extensions/funding-queue.js b/test/extensions/funding-queue.js
@@ -178,7 +178,7 @@ contract("Funding Queues", (accounts) => {
     const repCycle = await getActiveRepCycle(colonyNetwork);
     await forwardTime(MINING_CYCLE_DURATION + SUBMITTER_ONLY_WINDOW + 1, this);
     await repCycle.submitRootHash(rootHash, 0, "0x00", 10, { from: MINER });
-    await repCycle.confirmNewHash(0);
+    await repCycle.confirmNewHash(0, { from: MINER });
   });
 
   describe("managing the extension", async () => {

diff --git a/test/extensions/voting-rep.js b/test/extensions/voting-rep.js
@@ -243,7 +243,7 @@ contract("Voting Reputation", (accounts) => {
     await forwardTime(MINING_CYCLE_DURATION, this);
     await repCycle.submitRootHash(rootHash, 0, "0x00", 10, { from: MINER });
     await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
-    await repCycle.confirmNewHash(0);
+    await repCycle.confirmNewHash(0, { from: MINER });
   });
 
   function hashExpenditureSlot(action) {
@@ -1063,7 +1063,7 @@ contract("Voting Reputation", (accounts) => {
       const repCycle = await getActiveRepCycle(colonyNetwork);
       await repCycle.submitRootHash(rootHash, 0, "0x00", 10, { from: MINER });
       await forwardTime(SUBMITTER_ONLY_WINDOW + 1, this);
-      await repCycle.confirmNewHash(0);
+      await repCycle.confirmNewHash(0, { from: MINER });
 
       // Create new motion with new reputation state
       const action = await encodeTxData(colony, "mintTokens", [WAD]);