fix tests coverage (#214)

dexe-network · Jul 1, 2024 · 414efe6 · 414efe6
1 parent f93c650
commit 414efe6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/contracts/libs/gov/gov-pool/GovPoolVote.sol b/contracts/libs/gov/gov-pool/GovPoolVote.sol
@@ -367,11 +367,11 @@ library GovPoolVote {
     function _quorumReached(IGovPool.ProposalCore storage core) internal view returns (bool) {
         (, address userKeeperAddress, , , ) = IGovPool(address(this)).getHelperContracts();
 
+        uint256 totalPower = IGovUserKeeper(userKeeperAddress).getTotalPower();
+
         return
-            PERCENTAGE_100.ratio(
-                core.votesFor + core.votesAgainst,
-                IGovUserKeeper(userKeeperAddress).getTotalPower()
-            ) >= core.settings.quorum;
+            PERCENTAGE_100.ratio(core.votesFor, totalPower) >= core.settings.quorum ||
+            PERCENTAGE_100.ratio(core.votesAgainst, totalPower) >= core.settings.quorum;
     }
 
     function _quorumReachedThroughVoting(

diff --git a/test/gov/proposals/DistributionProposal.test.js b/test/gov/proposals/DistributionProposal.test.js
@@ -716,10 +716,16 @@ describe("DistributionProposal", () => {
       });
 
       it("should correctly calculate reward", async () => {
-        const ONE_NFT_VOTE = SINGLE_NFT_POWER.dividedBy(9).integerValue();
-        const THREE_NFT_VOTES = SINGLE_NFT_POWER.times(3).dividedBy(9).integerValue();
-        const FOUR_NFT_VOTES = SINGLE_NFT_POWER.times(4).dividedBy(9).integerValue();
-        const ALL_NFT_VOTES = THREE_NFT_VOTES.plus(FOUR_NFT_VOTES).plus(ONE_NFT_VOTE.times(2));
+        for (let i = 10; i < 15; i++) {
+          await nft.mint(SECOND, i);
+        }
+
+        await nft.setApprovalForAll(userKeeper.address, true, { from: SECOND });
+        await govPool.deposit(0, [10, 11, 12, 13, 14], { from: SECOND });
+
+        const ONE_NFT_VOTE = SINGLE_NFT_POWER.dividedBy(14).integerValue();
+        const TEN_NFT_VOTES = SINGLE_NFT_POWER.times(10).dividedBy(14).integerValue();
+        const ALL_NFT_VOTES = SINGLE_NFT_POWER.times(13).dividedBy(14).integerValue();
 
         await govPool.createProposal(
           "example.com",
@@ -728,15 +734,15 @@ describe("DistributionProposal", () => {
           { from: SECOND },
         );
 
-        await govPool.vote(1, true, 0, [1, 2, 3, 4, 5], { from: SECOND });
         await govPool.vote(1, false, 0, [6, 7, 9], { from: THIRD });
+        await govPool.vote(1, true, 0, [1, 2, 3, 4, 5, 10, 11, 12, 13, 14], { from: SECOND });
 
         await setTime(startTime + 10000);
         await govPool.execute(1);
 
         assert.closeTo(
           (await dp.getPotentialReward(1, SECOND)).toNumber(),
-          toBN(wei(1)).times(FOUR_NFT_VOTES.plus(ONE_NFT_VOTE)).idiv(ALL_NFT_VOTES.minus(ONE_NFT_VOTE)).toNumber(),
+          toBN(wei(1)).times(TEN_NFT_VOTES).idiv(ALL_NFT_VOTES).toNumber(),
           10,
         );
         assert.equal(await dp.getPotentialReward(1, THIRD), 0);