Brian/foundry test

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts

contracts/interfaces/IClaimAdapter.sol

@@ -16,7 +16,7 @@
     SPDX-License-Identifier: Apache License, Version 2.0
 */
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "../interfaces/ISetToken.sol";
 

contracts/interfaces/IModuleIssuanceHook.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "./ISetToken.sol";
 

contracts/interfaces/IModuleIssuanceHookV2.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "./ISetToken.sol";
 

contracts/interfaces/IPerpV2LeverageModule.sol

@@ -18,7 +18,7 @@
 pragma solidity 0.6.10;
 pragma experimental "ABIEncoderV2";
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "./ISetToken.sol";
 import { IDebtIssuanceModule } from "./IDebtIssuanceModule.sol";

contracts/interfaces/ISetToken.sol

@@ -18,7 +18,7 @@
 pragma solidity 0.6.10;
 pragma experimental "ABIEncoderV2";
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 /**
  * @title ISetToken

contracts/interfaces/external/ICErc20.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/interfaces/external/ICEth.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/interfaces/external/IDMMFactory.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.6.10;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/token/ERC20/IERC20.sol";
 
 interface IDMMFactory {
     function createPool(

contracts/interfaces/external/IDMMPool.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.6.10;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/token/ERC20/IERC20.sol";
 
 import "./IDMMFactory.sol";
 

contracts/interfaces/external/IWETH.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 /**
  * @title IWETH

contracts/interfaces/external/aave-v2/IAToken.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 interface IAToken is IERC20 {
     function UNDERLYING_ASSET_ADDRESS() external view returns (address);
 }

contracts/interfaces/external/aave-v2/IStableDebtToken.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 /**
  * @title IStableDebtToken

contracts/interfaces/external/aave-v2/IVariableDebtToken.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 /**
  * @title IVariableDebtToken

contracts/lib/ExplicitERC20.sol

@@ -18,9 +18,9 @@
 
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/token/ERC20/SafeERC20.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 
 /**
  * @title ExplicitERC20

contracts/lib/PreciseUnitMath.sol

@@ -19,9 +19,9 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import { SafeCast } from "@openzeppelin/contracts/utils/SafeCast.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
-import { SignedSafeMath } from "@openzeppelin/contracts/math/SignedSafeMath.sol";
+import { SafeCast } from "@openzeppelin/utils/SafeCast.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
+import { SignedSafeMath } from "@openzeppelin/math/SignedSafeMath.sol";
 
 
 /**

contracts/lib/UnitConversionUtils.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
-import { SignedSafeMath } from "@openzeppelin/contracts/math/SignedSafeMath.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
+import { SignedSafeMath } from "@openzeppelin/math/SignedSafeMath.sol";
 
 /**
  * @title UnitConversionUtils

contracts/mocks/ContractCallerMock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+import { Address } from "@openzeppelin/utils/Address.sol";
 
 
 contract ContractCallerMock {

contracts/mocks/ExplicitERC20Mock.sol

@@ -20,7 +20,7 @@ pragma solidity 0.6.10;
 pragma experimental "ABIEncoderV2";
 
 import { ExplicitERC20 } from "../lib/ExplicitERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 contract ExplicitERC20Mock {
 

contracts/mocks/OracleAdapterMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { Ownable } from "@openzeppelin/access/Ownable.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 
 import { IOracle } from "../interfaces/IOracle.sol";
 

contracts/mocks/StandardTokenMock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/token/ERC20/ERC20.sol";
 
 // mock class using BasicToken
 contract StandardTokenMock is ERC20 {

contracts/mocks/StandardTokenWithFeeMock.sol

@@ -18,7 +18,7 @@
 pragma solidity 0.6.10;
 
 
-import "@openzeppelin/contracts/math/SafeMath.sol";
+import "@openzeppelin/math/SafeMath.sol";
 
 
 // mock class using BasicToken

contracts/mocks/StandardTokenWithRoundingErrorMock.sol

@@ -19,9 +19,9 @@
 pragma solidity 0.6.10;
 
 import "./StandardTokenMock.sol";
-import "@openzeppelin/contracts/math/SignedSafeMath.sol";
-import "@openzeppelin/contracts/math/SafeMath.sol";
-import "@openzeppelin/contracts/utils/SafeCast.sol";
+import "@openzeppelin/math/SignedSafeMath.sol";
+import "@openzeppelin/math/SafeMath.sol";
+import "@openzeppelin/utils/SafeCast.sol";
 
 contract StandardTokenWithRoundingErrorMock {
     using SignedSafeMath for int256;

contracts/mocks/external/ComptrollerMock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
 import { ICErc20 } from "../../interfaces/external/ICErc20.sol";
 
 contract ComptrollerMock {

contracts/mocks/external/KyberNetworkProxyMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 
 // Mock contract implementation of KyberNetworkProxy, where token can only be traded against WETH for simplicity.
 // Adapted from Argent mock Kyber implementation

contracts/mocks/external/OneInchExchangeMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 
 // Mock contract implementation of 1Inch
 contract OneInchExchangeMock {

contracts/mocks/external/SynthetixExchangerMock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 import { SynthMock } from "./SynthMock.sol";
 
 contract SynthetixExchangerMock {

contracts/mocks/external/YearnStrategyMock.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/token/ERC20/IERC20.sol";
 import {BaseStrategyInitializable, StrategyParams, VaultAPI} from "../../../external/contracts/yearn/BaseStrategy.sol";
 
 /*

contracts/mocks/external/ZeroExMock.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
 
 // Minimal 0x Exchange Proxy contract interface.
 contract ZeroExMock {

contracts/mocks/integrations/AmmAdapterMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/mocks/integrations/ClaimAdapterMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "../../interfaces/ISetToken.sol";
 

contracts/mocks/integrations/GovernanceAdapterMock.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/mocks/integrations/StakingAdapterMock.sol

@@ -18,9 +18,9 @@
 
 pragma solidity 0.6.10;
 
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/mocks/integrations/TradeAdapterMock.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
 
 /**
  * @title TradeAdapterMock

contracts/mocks/integrations/WrapAdapterMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/mocks/integrations/WrapV2AdapterMock.sol

@@ -18,8 +18,8 @@
 
 pragma solidity 0.6.10;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 
 /**

contracts/mocks/protocol/integration/lib/PerpV2Mock.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.6.10;
 pragma experimental ABIEncoderV2;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 import { IClearingHouse } from "../../../../interfaces/external/perp-v2/IClearingHouse.sol";
 import { IVault } from "../../../../interfaces/external/perp-v2/IVault.sol";
 import { IQuoter } from "../../../../interfaces/external/perp-v2/IQuoter.sol";

contracts/mocks/protocol/lib/ModuleBaseMock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { IController } from "../../../interfaces/IController.sol";
 import { ISetToken } from "../../../interfaces/ISetToken.sol";

contracts/mocks/protocol/module/DebtIssuanceMock.sol

@@ -17,7 +17,7 @@
 */
 pragma solidity 0.6.10;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
 
 import { ISetToken } from "../../../interfaces/ISetToken.sol";
 

contracts/mocks/protocol/module/DebtModuleMock.sol

@@ -19,10 +19,10 @@
 pragma solidity 0.6.10;
 pragma experimental "ABIEncoderV2";
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { SafeCast } from "@openzeppelin/contracts/utils/SafeCast.sol";
-import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
-import { SignedSafeMath } from "@openzeppelin/contracts/math/SignedSafeMath.sol";
+import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol";
+import { SafeCast } from "@openzeppelin/utils/SafeCast.sol";
+import { SafeMath } from "@openzeppelin/math/SafeMath.sol";
+import { SignedSafeMath } from "@openzeppelin/math/SignedSafeMath.sol";
 
 import { Invoke } from "../../../protocol/lib/Invoke.sol";
 import { IController } from "../../../interfaces/IController.sol";