Merge pull request defisaver#544 from defisaver/test/chain-agnostic-tests

test: fix tests

Author: milosdjurica

package.json

@@ -34,7 +34,7 @@
         "@commitlint/config-conventional": "^12.1.1",
         "@curvefi/api": "=2.52.1",
         "@defisaver/automation-sdk": "^3.0.2",
-        "@defisaver/sdk": "^1.3.2",
+        "@defisaver/sdk": "^1.3.18",
         "@defisaver/tokens": "^1.6.5",
         "@nomicfoundation/hardhat-verify": "^2.0.11",
         "@nomiclabs/hardhat-ethers": "^2.2.3",

test-sol/actions/sky/SkyStakingEngineClaimRewards.t.sol

@@ -99,7 +99,7 @@ contract TestSkyStakingEngineClaimRewards is SkyExecuteActions {
         SkyView.UrnInfo[] memory urnsInfoBeforeClaim = skyView.getUserInfo(walletAddr, farms);
         uint256 amountEarnedBeforeClaim = urnsInfoBeforeClaim[index].amountsEarned[0].amountEarned;
 
-        if (_farm != USDS_FARM) {
+        if (_farm != USDS_FARM && _farm != SPARK_FARM) {
             assertGt(amountEarnedBeforeClaim, 0, "Should have earned rewards before claiming");
         }
 
@@ -112,7 +112,7 @@ contract TestSkyStakingEngineClaimRewards is SkyExecuteActions {
         wallet.execute(address(cut), executeActionCallData, 0);
 
         uint256 amountAfter = IERC20(_rewardToken).balanceOf(sender);
-        if (_farm != USDS_FARM) {
+        if (_farm != USDS_FARM && _farm != SPARK_FARM) {
             assertGt(amountAfter, amountBefore);
         }
 

test-sol/views/AaveV3View.t.sol

@@ -262,7 +262,7 @@ contract TestAaveV3View is BaseTest, ActionsUtils, AaveV3Helper {
             TestConfig({
                 supplyToken: Addresses.WETH_ADDR,
                 borrowToken: Addresses.USDT_ADDR,
-                supplyAmount: 30e18, // 30 WETH
+                supplyAmount: 40e18, // 40 WETH
                 borrowAmount: 50_000e6, // 50k USDT
                 initialBalance: 100e18 // 100 WETH
             })
@@ -273,7 +273,7 @@ contract TestAaveV3View is BaseTest, ActionsUtils, AaveV3Helper {
             TestConfig({
                 supplyToken: Addresses.WETH_ADDR,
                 borrowToken: Addresses.USDC_ADDR,
-                supplyAmount: 30e18, // 30 WETH
+                supplyAmount: 40e18, // 40 WETH
                 borrowAmount: 50_000e6, // 50k USDC
                 initialBalance: 100e18 // 100 WETH
             })
@@ -284,7 +284,7 @@ contract TestAaveV3View is BaseTest, ActionsUtils, AaveV3Helper {
             TestConfig({
                 supplyToken: Addresses.WBTC_ADDR,
                 borrowToken: Addresses.USDT_ADDR,
-                supplyAmount: 3e8, // 3 WBTC
+                supplyAmount: 4e8, // 4 WBTC
                 borrowAmount: 100_000e6, // 100k USDT
                 initialBalance: 10e8 // 10 WBTC
             })
@@ -295,7 +295,7 @@ contract TestAaveV3View is BaseTest, ActionsUtils, AaveV3Helper {
             TestConfig({
                 supplyToken: Addresses.WBTC_ADDR,
                 borrowToken: Addresses.GHO_TOKEN,
-                supplyAmount: 3e8, // 3 WBTC
+                supplyAmount: 4e8, // 4 WBTC
                 borrowAmount: 100_000e8, // 100k GHO
                 initialBalance: 10e8 // 10 WBTC
             })

test-sol/views/SkyView.t.sol

@@ -131,7 +131,7 @@ contract TestSkyView is SkyExecuteActions {
         SkyView.UrnInfo[] memory urnsInfoAfterAYear = cut.getUserInfo(walletAddr, farms);
 
         for (uint256 i = 0; i < urnsInfoAfterAYear[index].amountsEarned.length; i++) {
-            if (_farm == USDS_FARM) continue; // USDS farm is currently not earning any rewards
+            if (_farm == USDS_FARM || _farm == SPARK_FARM) continue; // USDS and SPARK farm are currently not earning any rewards
             if (urnsInfoAfterAYear[index].amountsEarned[i].farm == _farm) {
                 assertGt(
                     urnsInfoAfterAYear[index].amountsEarned[i].amountEarned,