[FF-ONLY] Tests: fix integration tests

contracts/interfaces/IAssessment.sol

@@ -6,13 +6,6 @@ interface IAssessment {
 
   /* ========== DATA STRUCTURES ========== */
 
-  enum UintParams {
-    minVotingPeriodInDays,
-    stakeLockupPeriodInDays,
-    payoutCooldownInDays,
-    silentEndingPeriodInDays
-  }
-
   struct Stake {
     uint96 amount;
     uint104 rewardsWithdrawableFromIndex;

contracts/mocks/generic/AssessmentGeneric.sol

@@ -81,8 +81,4 @@ contract AssessmentGeneric is IAssessment {
   function processFraud(uint256, bytes32[] calldata, address, uint256, uint96, uint16, uint256) external pure {
     revert("processFraud unsupported");
   }
-
-  function updateUintParameters(UintParams[] calldata, uint[] calldata) external pure {
-    revert("updateUintParameters unsupported");
-  }
 }

contracts/modules/assessment/AssessmentViewer.sol

@@ -53,9 +53,9 @@ contract AssessmentViewer is IAssessmentViewer {
     }
 
     (,, uint timestamp,) = _assessment.votesOf(member, voteCount - 1);
-    uint stakeLockupPeriodInDays = _assessment.getStakeLockupPeriod();
+    uint stakeLockupPeriod = _assessment.getStakeLockupPeriod();
 
-    uint stakeLockupExpiry = timestamp + stakeLockupPeriodInDays;
+    uint stakeLockupExpiry = timestamp + stakeLockupPeriod;
     bool isStakeLocked = stakeLockupExpiry > block.timestamp;
 
     return AssessmentStakeLockedState({

test/fork/basic-functionality-tests.js

@@ -17,7 +17,6 @@ const {
 } = require('./utils');
 
 const { ProposalCategory: PROPOSAL_CATEGORIES } = require('../../lib/constants');
-const { daysToSeconds } = require('../../lib/helpers');
 const { setNextBlockTime, mineNextBlock } = require('../utils/evm');
 const VariableDebtTokenAbi = require('./abi/aave/VariableDebtToken.json');
 const { InternalContractsIDs } = require('../utils').constants;
@@ -67,9 +66,9 @@ async function castAssessmentVote() {
   const { poll: pollResult } = await this.assessment.assessments(assessmentId);
   const poll = pollResult;
 
-  const { payoutCooldownInDays } = await this.assessment.config();
+  const payoutCooldown = (await this.assessment.getPayoutCooldown()).toNumber();
 
-  const futureTime = poll.end + daysToSeconds(payoutCooldownInDays);
+  const futureTime = poll.end + payoutCooldown;
 
   await setTime(futureTime);
 }

test/integration/Assessment/processFraud.js

@@ -81,7 +81,7 @@ describe('processFraud', function () {
     await setEtherBalance(governance.address, parseEther('1000'));
 
     await assessment.connect(fraudulentMember).stake(fixture.amount.mul(100));
-    await individualClaims.submitClaim(1, 0, fixture.amount, '', { value: fixture.amount });
+    await individualClaims.submitClaim(1, fixture.amount, '', { value: fixture.amount });
     await assessment.connect(fraudulentMember).castVotes([0], [true], ['Assessment data hash'], 0);
     const merkleTree = await submitFraud({
       assessment,
@@ -111,10 +111,11 @@ describe('processFraud', function () {
     const [fraudulentMember] = fixture.accounts.members;
     await setEtherBalance(governance.address, parseEther('1000'));
     await assessment.connect(fraudulentMember).stake(fixture.amount.mul(100));
-    const { minVotingPeriodInDays, payoutCooldownInDays } = await assessment.config();
+    const minVotingPeriod = (await assessment.getMinVotingPeriod()).toNumber();
+    const payoutCooldown = (await assessment.getPayoutCooldown()).toNumber();
 
     // Fraudulent vote
-    await individualClaims.submitClaim(1, 0, fixture.amount, '', { value: fixture.amount });
+    await individualClaims.submitClaim(1, fixture.amount, '', { value: fixture.amount });
     await assessment.connect(fraudulentMember).castVotes([0], [true], ['Assessment data hash'], 0);
     const merkleTree = await submitFraud({
       assessment,
@@ -138,10 +139,10 @@ describe('processFraud', function () {
     expect(indexAfterFraudProcess).to.be.eq(1);
 
     // Good vote
-    await individualClaims.submitClaim(2, 0, fixture.amount, '', { value: fixture.amount });
+    await individualClaims.submitClaim(2, fixture.amount, '', { value: fixture.amount });
     await assessment.connect(fraudulentMember).castVotes([1], [true], ['Assessment data hash'], 0);
 
-    await increaseTime(daysToSeconds(minVotingPeriodInDays + payoutCooldownInDays + 1));
+    await increaseTime(minVotingPeriod + payoutCooldown + 1);
     await assessment.withdrawRewards(fraudulentMember.address, 1);
     const { rewardsWithdrawableFromIndex: indexAfterGoodVote } = await assessment.stakeOf(fraudulentMember.address);
     expect(indexAfterGoodVote).to.be.eq(2);

test/integration/Cover/totalActiveCover.js

@@ -155,10 +155,10 @@ describe.skip('totalActiveCover', function () {
 
     {
       // advance past payout cooldown
-      const { payoutCooldownInDays } = await as.config();
+      const payoutCooldown = (await as.getPayoutCooldown()).toNumber();
 
       const { end } = await as.getPoll(assessmentId);
-      await setTime(end + daysToSeconds(payoutCooldownInDays));
+      await setTime(end + payoutCooldown);
     }
 
     // fully paid cover
@@ -225,10 +225,10 @@ describe.skip('totalActiveCover', function () {
 
     {
       // advance past payout cooldown
-      const { payoutCooldownInDays } = await as.config();
+      const payoutCooldown = (await as.getPayoutCooldown()).toNumber();
 
       const { end } = await as.getPoll(assessmentId);
-      await setTime(end + daysToSeconds(payoutCooldownInDays));
+      await setTime(end + payoutCooldown);
     }
 
     // partial paid cover
@@ -303,10 +303,10 @@ describe.skip('totalActiveCover', function () {
 
     {
       // advance past payout cooldown
-      const { payoutCooldownInDays } = await as.config();
+      const payoutCooldown = (await as.getPayoutCooldown()).toNumber();
 
       const { end } = await as.getPoll(assessmentId);
-      await setTime(end + daysToSeconds(payoutCooldownInDays));
+      await setTime(end + payoutCooldown);
     }
 
     await expect(