From dbc208ab06c8a66ee770eccd1a87a8ae6348d4bb Mon Sep 17 00:00:00 2001 From: Daniel Von Fange Date: Wed, 5 Apr 2023 14:39:58 -0400 Subject: [PATCH 1/2] Flipper N-14 Unused import --- contracts/contracts/vault/VaultCore.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/contracts/contracts/vault/VaultCore.sol b/contracts/contracts/vault/VaultCore.sol index 6943de2966..e910a49e9f 100644 --- a/contracts/contracts/vault/VaultCore.sol +++ b/contracts/contracts/vault/VaultCore.sol @@ -13,11 +13,9 @@ pragma solidity ^0.8.0; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol"; -import "@openzeppelin/contracts/utils/Strings.sol"; import { StableMath } from "../utils/StableMath.sol"; import { IOracle } from "../interfaces/IOracle.sol"; -import { IVault } from "../interfaces/IVault.sol"; import { IBuyback } from "../interfaces/IBuyback.sol"; import "./VaultStorage.sol"; From 4355edfa43784e5632be91f18dc3a61fc609a188 Mon Sep 17 00:00:00 2001 From: Daniel Von Fange Date: Fri, 14 Apr 2023 15:31:59 -0400 Subject: [PATCH 2/2] Moving imports down to the lowest used level --- contracts/contracts/vault/VaultAdmin.sol | 1 + contracts/contracts/vault/VaultCore.sol | 2 ++ contracts/contracts/vault/VaultStorage.sol | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contracts/contracts/vault/VaultAdmin.sol b/contracts/contracts/vault/VaultAdmin.sol index 9b0d6e051d..76bdc0bd1d 100644 --- a/contracts/contracts/vault/VaultAdmin.sol +++ b/contracts/contracts/vault/VaultAdmin.sol @@ -11,6 +11,7 @@ import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.s import { StableMath } from "../utils/StableMath.sol"; import { IOracle } from "../interfaces/IOracle.sol"; +import { IStrategy } from "../interfaces/IStrategy.sol"; import "./VaultStorage.sol"; contract VaultAdmin is VaultStorage { diff --git a/contracts/contracts/vault/VaultCore.sol b/contracts/contracts/vault/VaultCore.sol index e910a49e9f..ea409d352f 100644 --- a/contracts/contracts/vault/VaultCore.sol +++ b/contracts/contracts/vault/VaultCore.sol @@ -17,6 +17,8 @@ import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol"; import { StableMath } from "../utils/StableMath.sol"; import { IOracle } from "../interfaces/IOracle.sol"; import { IBuyback } from "../interfaces/IBuyback.sol"; +import { IStrategy } from "../interfaces/IStrategy.sol"; +import "../utils/Helpers.sol"; import "./VaultStorage.sol"; contract VaultCore is VaultStorage { diff --git a/contracts/contracts/vault/VaultStorage.sol b/contracts/contracts/vault/VaultStorage.sol index 3942a923ab..e577a951ba 100644 --- a/contracts/contracts/vault/VaultStorage.sol +++ b/contracts/contracts/vault/VaultStorage.sol @@ -12,11 +12,9 @@ import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.s import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol"; import { Address } from "@openzeppelin/contracts/utils/Address.sol"; -import { IStrategy } from "../interfaces/IStrategy.sol"; import { Governable } from "../governance/Governable.sol"; import { OUSD } from "../token/OUSD.sol"; import { Initializable } from "../utils/Initializable.sol"; -import "../utils/Helpers.sol"; import { StableMath } from "../utils/StableMath.sol"; contract VaultStorage is Initializable, Governable {