Fixed unit tests

Author: naddison36

contracts/hardhat.config.js

@@ -73,6 +73,7 @@ const SONIC_DEPLOYER = MAINNET_DEPLOYER;
 const SONIC_ADMIN = "0xAdDEA7933Db7d83855786EB43a238111C69B00b6";
 // 2/8 multi-sig that controls fund allocations. Aka "Guardian".
 const SONIC_STRATEGIST = "0x63cdd3072F25664eeC6FAEFf6dAeB668Ea4de94a";
+const MAINNET_RELAYER = "0x4b91827516f79d6F6a1F292eD99671663b09169a";
 
 const MULTICHAIN_STRATEGIST = "0x4FF1b9D9ba8558F5EAfCec096318eA0d8b541971";
 
@@ -201,6 +202,13 @@ const localEnvStrategist =
       : MULTICHAIN_STRATEGIST
     : 0;
 
+const localEnvRegistrator =
+  process.env.FORK === "true"
+    ? isHoodiFork
+      ? HOODI_RELAYER
+      : MAINNET_RELAYER
+    : 1; // signer at index 2
+
 module.exports = {
   solidity: {
     version: "0.8.28",
@@ -407,6 +415,12 @@ module.exports = {
     multichainStrategistAddr: {
       default: MULTICHAIN_STRATEGIST,
     },
+    registratorAddr: {
+      default: 2,
+      localhost: localEnvRegistrator,
+      mainnet: MAINNET_RELAYER,
+      hoodi: HOODI_RELAYER,
+    },
   },
   contractSizer: {
     alphaSort: true,

contracts/test/_fixture.js

@@ -2034,9 +2034,10 @@ async function compoundingStakingSSVStrategyFixture() {
     */
   } else {
     fixture.ssvNetwork = await ethers.getContract("MockSSVNetwork");
-    const { governorAddr } = await getNamedAccounts();
+    const { governorAddr, registratorAddr } = await getNamedAccounts();
     const { oethVault, weth } = fixture;
     const sGovernor = await ethers.provider.getSigner(governorAddr);
+    const sRegistrator = await ethers.provider.getSigner(registratorAddr);
 
     // Approve Strategy
     await oethVault
@@ -2053,13 +2054,13 @@ async function compoundingStakingSSVStrategyFixture() {
 
     await compoundingStakingSSVStrategy
       .connect(sGovernor)
-      .setRegistrator(governorAddr);
+      .setRegistrator(registratorAddr);
 
     await compoundingStakingSSVStrategy
       .connect(sGovernor)
       .setHarvesterAddress(fixture.oethHarvester.address);
 
-    fixture.validatorRegistrator = sGovernor;
+    fixture.validatorRegistrator = sRegistrator;
   }
 
   return fixture;

contracts/test/behaviour/strategy.js

@@ -218,11 +218,18 @@ const shouldBehaveLikeStrategy = (context) => {
 
         const harvesterSigner = await impersonateAndFund(harvester.address);
         for (const signer of [harvesterSigner, governor, strategist, matt]) {
-          await expect(
-            strategy
+          try {
+            await strategy
               .connect(signer)
-              .withdraw(vault.address, assets[0].address, parseUnits("10"))
-          ).to.revertedWith("Caller is not the Vault");
+              .withdraw(vault.address, assets[0].address, parseUnits("1"));
+            expect.fail("Expected transaction to revert");
+          } catch (error) {
+            console.log("Error message:", error.message);
+            expect(error.message).to.be.oneOf([
+              "VM Exception while processing transaction: reverted with reason string 'Caller is not the Vault'",
+              "VM Exception while processing transaction: reverted with reason string 'Caller not Vault or Registrator'",
+            ]);
+          }
         }
       });
       it("Should be able to call withdraw all by vault", async () => {

contracts/test/strategies/compoundingSSVStaking.js

@@ -8,7 +8,7 @@ const {
   setBalance,
   setStorageAt,
 } = require("@nomicfoundation/hardhat-network-helpers");
-const { isCI } = require("../helpers");
+const { isCI, getAssetAddresses } = require("../helpers");
 const { shouldBehaveLikeGovernable } = require("../behaviour/governable");
 const { shouldBehaveLikeStrategy } = require("../behaviour/strategy");
 const { MAX_UINT256, ZERO_BYTES32 } = require("../../utils/constants");
@@ -143,12 +143,11 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
     it("SSV network should have allowance to spend SSV tokens of the strategy", async () => {
       const { compoundingStakingSSVStrategy, ssv } = fixture;
 
-      const ssvNetworkAddress =
-        await compoundingStakingSSVStrategy.SSV_NETWORK();
+      const ssvNetworkAddress = await getAssetAddresses(deployments);
       await expect(
         await ssv.allowance(
           compoundingStakingSSVStrategy.address,
-          ssvNetworkAddress
+          ssvNetworkAddress.SSVNetwork
         )
       ).to.equal(MAX_UINT256);
     });
@@ -1864,7 +1863,7 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
     });
 
     it("Should withdraw ETH from the strategy, no ETH", async () => {
-      const { compoundingStakingSSVStrategy, weth, josh } = fixture;
+      const { compoundingStakingSSVStrategy, weth, josh, oethVault } = fixture;
 
       const depositAmount = parseEther("10");
       await weth
@@ -1879,7 +1878,7 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
 
       const withdrawTx = compoundingStakingSSVStrategy
         .connect(sVault)
-        .withdraw(josh.address, weth.address, depositAmount);
+        .withdraw(oethVault.address, weth.address, depositAmount);
 
       await expect(withdrawTx)
         .to.emit(compoundingStakingSSVStrategy, "Withdrawal")
@@ -1898,7 +1897,13 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
     });
 
     it("Should withdraw ETH from the strategy, withdraw some ETH", async () => {
-      const { compoundingStakingSSVStrategy, weth, josh } = fixture;
+      const {
+        compoundingStakingSSVStrategy,
+        weth,
+        josh,
+        oethVault,
+        validatorRegistrator,
+      } = fixture;
 
       const depositAmount = parseEther("10");
       await weth
@@ -1915,9 +1920,9 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
         await compoundingStakingSSVStrategy.checkBalance(weth.address);
 
       const withdrawTx = compoundingStakingSSVStrategy
-        .connect(sVault)
+        .connect(validatorRegistrator)
         .withdraw(
-          josh.address,
+          oethVault.address,
           weth.address,
           depositAmount.add(parseEther("5"))
         );
@@ -1970,7 +1975,17 @@ describe("Unit test: Compounding SSV Staking Strategy", function () {
           weth.address,
           parseEther("10")
         )
-      ).to.be.revertedWith("Must specify recipient");
+      ).to.be.revertedWith("Recipient not Vault");
+    });
+
+    it("Should revert when withdrawing to a user", async () => {
+      const { compoundingStakingSSVStrategy, weth, josh } = fixture;
+
+      await expect(
+        compoundingStakingSSVStrategy
+          .connect(sVault)
+          .withdraw(josh.address, weth.address, parseEther("10"))
+      ).to.be.revertedWith("Recipient not Vault");
     });
 
     it("Should withdrawAll ETH from the strategy, no ETH", async () => {