Fix tests

Author: SigismundSchlomo

contracts/staking/token/DoubleSidePool.sol

@@ -56,7 +56,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
         uint stakedAt;
     }
 
-    uint constant public MILLION = 1_000_000;
+    uint constant public BILLION = 1_000_000_000;
 
     LockKeeper public lockKeeper;
     RewardsBank public rewardsBank;
@@ -287,7 +287,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
     function _addInterestMainSide() internal {
         if (mainSideInfo.lastInterestUpdate + mainSideConfig.interestRate > block.timestamp) return;
         uint timePassed = block.timestamp - mainSideInfo.lastInterestUpdate;
-        uint newRewards = mainSideInfo.totalStake * mainSideConfig.interest * timePassed / MILLION / mainSideConfig.interestRate;
+        uint newRewards = mainSideInfo.totalStake * mainSideConfig.interest * timePassed / BILLION / mainSideConfig.interestRate;
 
         mainSideInfo.totalRewards += newRewards;
         mainSideInfo.lastInterestUpdate = block.timestamp;
@@ -364,7 +364,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
         mainSideInfo.totalRewards -= rewardsAmount;
         _updateRewardsDebt(false, user, _calcRewards(false, mainSideStakers[user].stake));
 
-        uint penalty = amount * mainSideConfig.fastUnstakePenalty / MILLION;
+        uint penalty = amount * mainSideConfig.fastUnstakePenalty / BILLION;
         if (mainSideConfig.token == address(0)) {
             payable(msg.sender).transfer(amount - penalty);
         } else {
@@ -382,7 +382,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
     function _addInterestDependantSide() internal {
         if (dependantSideInfo.lastInterestUpdate + dependantSideConfig.interestRate > block.timestamp) return;
         uint timePassed = block.timestamp - dependantSideInfo.lastInterestUpdate;
-        uint newRewards = dependantSideInfo.totalStake * dependantSideConfig.interest * timePassed / MILLION / dependantSideConfig.interestRate;
+        uint newRewards = dependantSideInfo.totalStake * dependantSideConfig.interest * timePassed / BILLION / dependantSideConfig.interestRate;
 
         dependantSideInfo.totalRewards += newRewards;
         dependantSideInfo.lastInterestUpdate = block.timestamp;
@@ -462,7 +462,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
         dependantSideInfo.totalRewards -= rewardsAmount;
         _updateRewardsDebt(true, user, _calcRewards(true, dependantSideStakers[user].stake));
 
-        uint penalty = amount * dependantSideConfig.fastUnstakePenalty / MILLION;
+        uint penalty = amount * dependantSideConfig.fastUnstakePenalty / BILLION;
         if (dependantSideConfig.token == address(0)) {
             payable(msg.sender).transfer(amount - penalty);
         } else {
@@ -476,7 +476,7 @@ contract DoubleSidePool  is Initializable, AccessControl, IOnBlockListener {
     }
 
     function _maxUserStakeValue(address user) internal view returns (uint) {
-        return mainSideStakers[user].stake * dependantSideConfig.stakeLimitsMultiplier / MILLION;
+        return mainSideStakers[user].stake * dependantSideConfig.stakeLimitsMultiplier / BILLION;
     }
 
     //COMMON METHODS

contracts/staking/token/SingleSidePool.sol

@@ -11,7 +11,6 @@ import "../../LockKeeper.sol";
 import "hardhat/console.sol";
 
 contract SingleSidePool is Initializable, AccessControl, IOnBlockListener {
-    uint constant public MILLION = 1_000_000;
 
     struct Config {
         IERC20 token;
@@ -39,6 +38,8 @@ contract SingleSidePool is Initializable, AccessControl, IOnBlockListener {
         uint lockedWithdrawal;
     }
 
+    uint constant public BILLION = 1_000_000_000;
+
     bool public active;
     RewardsBank rewardsBank;
     LockKeeper lockKeeper;
@@ -157,7 +158,7 @@ contract SingleSidePool is Initializable, AccessControl, IOnBlockListener {
 
         _unstake(msg.sender, amount);
 
-        uint penalty = amount * config.fastUnstakePenalty / MILLION;
+        uint penalty = amount * config.fastUnstakePenalty / BILLION;
         SafeERC20.safeTransfer(config.token, msg.sender, amount - penalty);
 
         _claimRewards(msg.sender);
@@ -212,7 +213,7 @@ contract SingleSidePool is Initializable, AccessControl, IOnBlockListener {
     function _addInterest() internal {
         if (info.lastInterestUpdate + config.interestRate > block.timestamp) return;
         uint timePassed = block.timestamp - info.lastInterestUpdate;
-        uint newRewards = info.totalStake * config.interest * timePassed / MILLION / config.interestRate;
+        uint newRewards = info.totalStake * config.interest * timePassed / BILLION / config.interestRate;
 
         info.totalRewards += newRewards;
         info.lastInterestUpdate = block.timestamp;

test/staking/token/SingleSidePool.ts

@@ -13,6 +13,7 @@ import {
 } from "../../../typechain-types";
 
 const D1 = 24 * 60 * 60;
+const BILLION = 1000000000;
 
 import { expect } from "chai";
 describe("SingleSidePool", function () {
@@ -32,19 +33,17 @@ describe("SingleSidePool", function () {
 
     const singleSidePoolParams: SingleSidePool.ConfigStruct = {
       token: token.address,
-      rewardsBank: rewardsBank.address,
-      lockKeeper: lockKeeper.address,
       name: "Test",
       minStakeValue: 10,
-      fastUnstakePenalty: 100000, // 10%
-      interest: 100000, // 10%
+      fastUnstakePenalty: 0.10 * BILLION, // 10%
+      interest: 0.10 * BILLION, // 10%
       interestRate: D1, // 1 day
       lockPeriod: D1, // 1 day
       rewardToken: token.address,
       rewardTokenPrice: 1,
     };
 
-    const singleSidePool = (await upgrades.deployProxy(singleSidePoolFactory, [singleSidePoolParams])) as SingleSidePool;
+    const singleSidePool = (await upgrades.deployProxy(singleSidePoolFactory, [rewardsBank.address, lockKeeper.address, singleSidePoolParams])) as SingleSidePool;
 
     await (await rewardsBank.grantRole(await rewardsBank.DEFAULT_ADMIN_ROLE(), singleSidePool.address)).wait();
     await (await token.grantRole(await token.MINTER_ROLE(), owner.address)).wait();