lint

OriginProtocol · Apr 29, 2024 · b73aacb · b73aacb
1 parent 0b52268
commit b73aacb
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 20 deletions.
diff --git a/contracts/contracts/oracle/OETHFixedOracle.sol b/contracts/contracts/oracle/OETHFixedOracle.sol
@@ -15,6 +15,7 @@ contract OETHFixedOracle is OETHOracleRouter {
      * @return feedAddress address of the price feed for the asset
      * @return maxStaleness maximum acceptable data staleness duration
      */
+    // solhint-disable-next-line no-unused-vars
     function feedMetadata(address asset)
         internal
         view

diff --git a/contracts/deploy/deployActions.js b/contracts/deploy/deployActions.js
@@ -5,15 +5,12 @@ const {
   getAssetAddresses,
   getOracleAddresses,
   isMainnet,
-  isFork,
   isMainnetOrFork,
   isHolesky,
-  isExternalNet,
 } = require("../test/helpers.js");
 const {
   deployWithConfirmation,
   withConfirmation,
-  sleep,
 } = require("../utils/deploy");
 const {
   metapoolLPCRVPid,
@@ -801,7 +798,7 @@ const deployFraxEthStrategy = async () => {
  */
 const upgradeNativeStakingSSVStrategy = async () => {
   const assetAddresses = await getAssetAddresses(deployments);
-  const { governorAddr, deployerAddr } = await getNamedAccounts();
+  const { deployerAddr } = await getNamedAccounts();
   const cOETHVaultProxy = await ethers.getContract("OETHVaultProxy");
   const strategyProxy = await ethers.getContract(
     "NativeStakingSSVStrategyProxy"

diff --git a/contracts/deploy/holesky/001_core.js b/contracts/deploy/holesky/001_core.js
@@ -1,5 +1,3 @@
-const hre = require("hardhat");
-
 const {
   deployOracles,
   deployOETHCore,

diff --git a/contracts/deploy/holesky/002_upgrade_strategy.js b/contracts/deploy/holesky/002_upgrade_strategy.js
@@ -1,10 +1,7 @@
-const hre = require("hardhat");
 const { upgradeNativeStakingSSVStrategy } = require("../deployActions");
 
 const mainExport = async () => {
   console.log("Running 002 deployment on Holesky...");
-  const { governorAddr } = await getNamedAccounts();
-  const sGovernor = await ethers.provider.getSigner(governorAddr);
 
   console.log("Upgrading native staking strategy");
   await upgradeNativeStakingSSVStrategy();

diff --git a/contracts/deploy/holesky/003_deposit_to_native_strategy.js b/contracts/deploy/holesky/003_deposit_to_native_strategy.js
@@ -1,4 +1,3 @@
-const hre = require("hardhat");
 const { utils, BigNumber } = require("ethers");
 const { withConfirmation } = require("../../utils/deploy");
 

diff --git a/contracts/deploy/mainnet/001_core.js b/contracts/deploy/mainnet/001_core.js
@@ -1,4 +1,3 @@
-const hre = require("hardhat");
 const { isFork } = require("../../test/helpers.js");
 
 const {
@@ -28,8 +27,6 @@ const {
   deployOUSDSwapper,
 } = require("../deployActions");
 
-const log = require("../../utils/logger")("deploy:001_core");
-
 const main = async () => {
   console.log("Running 001_core deployment...");
   await deployOracles();

diff --git a/contracts/test/_fixture.js b/contracts/test/_fixture.js
@@ -132,7 +132,7 @@ const simpleOETHFixture = deployments.createFixture(async () => {
 
   if (!isFork) {
     // Enable capital movement
-    await vault.connect(sGovernor).unpauseCapital();
+    await oethVault.connect(sGovernor).unpauseCapital();
   }
 
   const signers = await hre.ethers.getSigners();
@@ -160,9 +160,7 @@ const simpleOETHFixture = deployments.createFixture(async () => {
 
     // Reset allowances
     for (const user of [matt, josh, domen, daniel, franck]) {
-      for (const asset of [weth, reth, stETH, frxETH, sfrxETH]) {
-        await resetAllowance(asset, user, oethVault.address);
-      }
+      await resetAllowance(weth, user, oethVault.address);
     }
   }
 

diff --git a/contracts/test/strategies/nativeSsvStaking.holesky.fork-test.js b/contracts/test/strategies/nativeSsvStaking.holesky.fork-test.js
@@ -45,12 +45,12 @@ describe("Holesky ForkTest: Native SSV Staking Strategy", function () {
 
   describe("Deposit/Allocation register validators", function () {
     it("Should mint using WETH and see balance on the strategy contract", async () => {
-      const { nativeStakingSSVStrategy, josh, weth } = fixture;
+      const { josh, weth } = fixture;
       await mintTest(fixture, josh, weth, "32");
     });
 
     it("Should mint using WETH and deposit to a validator", async () => {
-      const { nativeStakingSSVStrategy, josh, weth } = fixture;
+      const { josh, weth } = fixture;
       await mintTest(fixture, josh, weth, "32");
 
       await registerAndDepositTest(fixture);
@@ -96,7 +96,6 @@ describe("Holesky ForkTest: Native SSV Staking Strategy", function () {
   const mintTest = async (fixture, user, asset, amount = "32") => {
     const { oethVault, oeth, weth, nativeStakingSSVStrategy, strategist } =
       fixture;
-    const { strategistAddr } = await getNamedAccounts();
 
     const unitAmount = await units(amount, asset);