✅ Adjust test setups to new constructor

Kwenta · Jul 19, 2024 · dafddbb · dafddbb
1 parent 18bf4e5
commit dafddbb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 1 deletion.
diff --git a/test/foundry/integration/escrow.migrator.fork.t.sol b/test/foundry/integration/escrow.migrator.fork.t.sol
@@ -55,6 +55,7 @@ contract StakingV2MigrationForkTests is EscrowMigratorTestHelpers {
             .runCompleteMigrationProcess({
             _owner: owner,
             _kwenta: address(kwenta),
+            _usdc: address(usdc),
             _supplySchedule: address(supplySchedule),
             _treasuryDAO: treasury,
             _rewardEscrowV1: address(rewardEscrowV1),

diff --git a/test/foundry/integration/stakingV2.migration.fork.t.sol b/test/foundry/integration/stakingV2.migration.fork.t.sol
@@ -38,6 +38,7 @@ contract StakingV2MigrationForkTests is StakingTestHelpers {
         ).runCompleteMigrationProcess({
             _owner: owner,
             _kwenta: address(kwenta),
+            _usdc: address(usdc),
             _supplySchedule: address(supplySchedule),
             _treasuryDAO: treasury,
             _rewardEscrowV1: address(rewardEscrowV1),

diff --git a/test/foundry/integration/stakingV2.upgrade.t.sol b/test/foundry/integration/stakingV2.upgrade.t.sol
@@ -197,6 +197,7 @@ contract StakingV2UpgradeTests is DefaultStakingV2Setup {
         stakingRewardsV3Implementation = address(
             new MockStakingRewardsV3(
                 address(kwenta),
+                address(usdc),
                 address(rewardEscrowV2),
                 address(rewardsNotifier)
             )

diff --git a/test/foundry/unit/StakingV2SetupTests.t.sol b/test/foundry/unit/StakingV2SetupTests.t.sol
@@ -138,6 +138,7 @@ contract StakingV2SetupTests is StakingV1Setup {
         stakingRewardsV2Implementation = address(
             new StakingRewardsV2(
                 address(0),
+                address(usdc),
                 rewardEscrowV2,
                 address(supplySchedule)
             )
@@ -149,6 +150,7 @@ contract StakingV2SetupTests is StakingV1Setup {
         stakingRewardsV2Implementation = address(
             new StakingRewardsV2(
                 address(kwenta),
+                address(usdc),
                 address(0),
                 address(supplySchedule)
             )
@@ -161,6 +163,7 @@ contract StakingV2SetupTests is StakingV1Setup {
         stakingRewardsV2Implementation = address(
             new StakingRewardsV2(
                 address(kwenta),
+                address(usdc),
                 rewardEscrowV2,
                 address(0)
             )
@@ -172,6 +175,7 @@ contract StakingV2SetupTests is StakingV1Setup {
         stakingRewardsV2Implementation = address(
             new StakingRewardsV2(
                 address(kwenta),
+                address(usdc),
                 rewardEscrowV2,
                 address(supplySchedule)
             )
@@ -193,6 +197,7 @@ contract StakingV2SetupTests is StakingV1Setup {
         stakingRewardsV2Implementation = address(
             new StakingRewardsV2(
                 address(kwenta),
+                address(usdc),
                 rewardEscrowV2,
                 address(supplySchedule)
             )

diff --git a/test/foundry/utils/Constants.t.sol b/test/foundry/utils/Constants.t.sol
@@ -12,6 +12,7 @@ uint256 constant OPTIMISM_BLOCK_NUMBER = 93_917_159;
 address constant OPTIMISM_STAKING_REWARDS_V1 = 0x6e56A5D49F775BA08041e28030bc7826b13489e0;
 address constant OPTIMISM_REWARD_ESCROW_V1 = 0x1066A8eB3d90Af0Ad3F89839b974658577e75BE2;
 address constant OPTIMISM_KWENTA_TOKEN = 0x920Cf626a271321C151D027030D5d08aF699456b;
+address constant OPTIMISM_USDC_TOKEN = 0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85;
 address constant OPTIMISM_SUPPLY_SCHEDULE = 0x3e8b82326Ff5f2f10da8CEa117bD44343ccb9c26;
 address constant OPTIMISM_KWENTA_OWNER = 0xF510a2Ff7e9DD7e18629137adA4eb56B9c13E885;
 address constant OPTIMISM_PDAO = 0xe826d43961a87fBE71C91d9B73F7ef9b16721C07;
@@ -40,6 +41,7 @@ uint256 constant OPTIMISM_STAKING_V2_FIRST_REWADRS_EMISSION_TIMESTAMP = 16953298
 //////////////////////////////////////////////////////////////*/
 
 address constant OPTIMISM_GOERLI_KWENTA_TOKEN = 0xDA0C33402Fc1e10d18c532F0Ed9c1A6c5C9e386C;
+address constant OPTIMISM_GOERLI_USDC_TOKEN = 0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6;
 address constant OPTIMISM_GOERLI_STAKING_REWARDS_V1 = 0x1653A3A3c4cceE0538685F1600a30dF5E3EE830A;
 address constant OPTIMISM_GOERLI_REWARD_ESCROW_V1 = 0xaFD87d1a62260bD5714C55a1BB4057bDc8dFA413;
 address constant OPTIMISM_GOERLI_SUPPLY_SCHEDULE = 0x671423b2e8a99882FD14BbD07e90Ae8B64A0E63A;

diff --git a/test/foundry/utils/mocks/MockStakingRewardsV3.t.sol b/test/foundry/utils/mocks/MockStakingRewardsV3.t.sol
@@ -8,9 +8,10 @@ contract MockStakingRewardsV3 is StakingRewardsV2 {
 
     constructor(
         address _kwenta,
+        address _usdc,
         address _rewardEscrow,
         address _rewardNotifier
-    ) StakingRewardsV2(_kwenta, _rewardEscrow, _rewardNotifier) {}
+    ) StakingRewardsV2(_kwenta, _usdc, _rewardEscrow, _rewardNotifier) {}
 
     function setNewNum(uint256 _newNum) external {
         newNum = _newNum;

diff --git a/test/foundry/utils/setup/StakingV1Setup.t.sol b/test/foundry/utils/setup/StakingV1Setup.t.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.13;
 import {console} from "forge-std/Test.sol";
 import {TestHelpers} from "../../utils/helpers/TestHelpers.t.sol";
 import {Kwenta} from "../../../../contracts/Kwenta.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {RewardEscrow} from "../../../../contracts/RewardEscrow.sol";
 import {SupplySchedule} from "../../../../contracts/SupplySchedule.sol";
 import {StakingRewards} from "../../../../contracts/StakingRewards.sol";
@@ -23,6 +24,7 @@ contract StakingV1Setup is TestHelpers {
     address internal user4;
     address internal user5;
 
+    IERC20 internal usdc;
     Kwenta internal kwenta;
     RewardEscrow internal rewardEscrowV1;
     SupplySchedule internal supplySchedule;
@@ -51,6 +53,7 @@ contract StakingV1Setup is TestHelpers {
             address(this),
             treasury
         );
+        usdc = IERC20(OPTIMISM_USDC_TOKEN);
         rewardEscrowV1 = new RewardEscrow(address(this), address(kwenta));
         supplySchedule = new SupplySchedule(address(this), treasury);
         supplySchedule.setKwenta(kwenta);

diff --git a/test/foundry/utils/setup/StakingV2Setup.t.sol b/test/foundry/utils/setup/StakingV2Setup.t.sol
@@ -64,6 +64,7 @@ contract StakingV2Setup is StakingV1Setup {
                 migrate.deploySystem.selector,
                 address(this),
                 address(kwenta),
+                address(usdc),
                 address(supplySchedule),
                 address(rewardEscrowV1),
                 treasury,