From a79146dfe6492aef0c6b1e04db4b86d17a1aa9d7 Mon Sep 17 00:00:00 2001 From: t11s Date: Tue, 5 Oct 2021 20:04:19 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Test=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Vault.sol | 2 +- src/external/WETH.sol | 10 ---------- src/test/Vault.t.sol | 2 +- src/test/VaultFactory.t.sol | 2 +- src/test/utils/DSTestPlus.sol | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 src/external/WETH.sol diff --git a/src/Vault.sol b/src/Vault.sol index b08ed60..c0c9c32 100644 --- a/src/Vault.sol +++ b/src/Vault.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity 0.8.6; -import {ERC20} from "solmate/erc20/ERC20.sol"; import {Auth} from "solmate/auth/Auth.sol"; +import {ERC20} from "solmate/erc20/ERC20.sol"; import {SafeERC20} from "solmate/erc20/SafeERC20.sol"; import {FixedPointMathLib} from "solmate/utils/FixedPointMathLib.sol"; diff --git a/src/external/WETH.sol b/src/external/WETH.sol deleted file mode 100644 index 7eb4854..0000000 --- a/src/external/WETH.sol +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.6; - -interface WETH { - function deposit() external payable; - - function withdraw(uint256) external; - - function transfer(address, uint256) external; -} diff --git a/src/test/Vault.t.sol b/src/test/Vault.t.sol index 3c48730..fd58ee3 100644 --- a/src/test/Vault.t.sol +++ b/src/test/Vault.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity 0.8.6; -import {MockERC20} from "solmate/tests/utils/MockERC20.sol"; +import {MockERC20} from "solmate/test/utils/MockERC20.sol"; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {MockStrategy} from "./mocks/MockStrategy.sol"; diff --git a/src/test/VaultFactory.t.sol b/src/test/VaultFactory.t.sol index 95e8930..97e0f41 100644 --- a/src/test/VaultFactory.t.sol +++ b/src/test/VaultFactory.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity 0.8.6; -import {MockERC20} from "solmate/tests/utils/MockERC20.sol"; +import {MockERC20} from "solmate/test/utils/MockERC20.sol"; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/utils/DSTestPlus.sol b/src/test/utils/DSTestPlus.sol index 77fbf12..5212ff2 100644 --- a/src/test/utils/DSTestPlus.sol +++ b/src/test/utils/DSTestPlus.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: AGPL-3.0-only pragma solidity 0.8.6; -import {DSTestPlus as DSTest} from "solmate/tests/utils/DSTestPlus.sol"; +import {DSTestPlus as DSTest} from "solmate/test/utils/DSTestPlus.sol"; import {ERC20} from "solmate/erc20/ERC20.sol"; import {Vault} from "../../Vault.sol";