From 7be2f89192a038283fe8e989dc66ab126025b9cb Mon Sep 17 00:00:00 2001 From: dglowinski Date: Sun, 19 May 2024 15:50:37 +0200 Subject: [PATCH] Remove unnecessary inheritance from Base contract --- src/EVault/Dispatch.sol | 1 - src/EVault/modules/Borrowing.sol | 2 +- src/EVault/modules/Governance.sol | 2 +- src/EVault/modules/Initialize.sol | 2 +- src/EVault/modules/Liquidation.sol | 2 +- src/EVault/modules/RiskManager.sol | 2 +- src/EVault/modules/Token.sol | 2 +- src/EVault/modules/Vault.sol | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/EVault/Dispatch.sol b/src/EVault/Dispatch.sol index c4f9f29b..ab04b337 100644 --- a/src/EVault/Dispatch.sol +++ b/src/EVault/Dispatch.sol @@ -21,7 +21,6 @@ import "./shared/Constants.sol"; /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice Contract which ties in the EVault modules and provides utilities for routing calls to modules and the EVC abstract contract Dispatch is - Base, InitializeModule, TokenModule, VaultModule, diff --git a/src/EVault/modules/Borrowing.sol b/src/EVault/modules/Borrowing.sol index d2de26d5..4d318724 100644 --- a/src/EVault/modules/Borrowing.sol +++ b/src/EVault/modules/Borrowing.sol @@ -17,7 +17,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling borrowing and repaying of vault assets -abstract contract BorrowingModule is IBorrowing, Base, AssetTransfers, BalanceUtils, LiquidityUtils { +abstract contract BorrowingModule is IBorrowing, AssetTransfers, BalanceUtils, LiquidityUtils { using TypesLib for uint256; using SafeERC20Lib for IERC20; diff --git a/src/EVault/modules/Governance.sol b/src/EVault/modules/Governance.sol index 2ed2ec75..d721827d 100644 --- a/src/EVault/modules/Governance.sol +++ b/src/EVault/modules/Governance.sol @@ -17,7 +17,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling governance, including configuration and fees -abstract contract GovernanceModule is IGovernance, Base, BalanceUtils, BorrowUtils, LTVUtils { +abstract contract GovernanceModule is IGovernance, BalanceUtils, BorrowUtils, LTVUtils { using TypesLib for uint16; // Protocol guarantees for the governor diff --git a/src/EVault/modules/Initialize.sol b/src/EVault/modules/Initialize.sol index 5512c6eb..ee6c2e89 100644 --- a/src/EVault/modules/Initialize.sol +++ b/src/EVault/modules/Initialize.sol @@ -17,7 +17,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module implementing the initialization of the new vault contract -abstract contract InitializeModule is IInitialize, Base, BorrowUtils { +abstract contract InitializeModule is IInitialize, BorrowUtils { using TypesLib for uint16; // Initial value of the interest accumulator: 1 ray diff --git a/src/EVault/modules/Liquidation.sol b/src/EVault/modules/Liquidation.sol index b9c4b2f3..70660996 100644 --- a/src/EVault/modules/Liquidation.sol +++ b/src/EVault/modules/Liquidation.sol @@ -13,7 +13,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling liquidations of unhealthy accounts -abstract contract LiquidationModule is ILiquidation, Base, BalanceUtils, LiquidityUtils { +abstract contract LiquidationModule is ILiquidation, BalanceUtils, LiquidityUtils { using TypesLib for uint256; struct LiquidationCache { diff --git a/src/EVault/modules/RiskManager.sol b/src/EVault/modules/RiskManager.sol index 43d48d68..03d16602 100644 --- a/src/EVault/modules/RiskManager.sol +++ b/src/EVault/modules/RiskManager.sol @@ -12,7 +12,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling risk management, including vault and account health checks -abstract contract RiskManagerModule is IRiskManager, Base, LiquidityUtils { +abstract contract RiskManagerModule is IRiskManager, LiquidityUtils { /// @inheritdoc IRiskManager function accountLiquidity(address account, bool liquidation) public diff --git a/src/EVault/modules/Token.sol b/src/EVault/modules/Token.sol index 5f5d9054..3aec5ed3 100644 --- a/src/EVault/modules/Token.sol +++ b/src/EVault/modules/Token.sol @@ -13,7 +13,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling ERC20 behaviour of vault shares -abstract contract TokenModule is IToken, Base, BalanceUtils { +abstract contract TokenModule is IToken, BalanceUtils { using TypesLib for uint256; /// @inheritdoc IERC20 diff --git a/src/EVault/modules/Vault.sol b/src/EVault/modules/Vault.sol index 3796168b..8cd3ea8a 100644 --- a/src/EVault/modules/Vault.sol +++ b/src/EVault/modules/Vault.sol @@ -15,7 +15,7 @@ import "../shared/types/Types.sol"; /// @custom:security-contact security@euler.xyz /// @author Euler Labs (https://www.eulerlabs.com/) /// @notice An EVault module handling ERC4626 standard behaviour -abstract contract VaultModule is IVault, Base, AssetTransfers, BalanceUtils { +abstract contract VaultModule is IVault, AssetTransfers, BalanceUtils { using TypesLib for uint256; using SafeERC20Lib for IERC20;