From 439d3772dbb66addb0626a350228ac2e485537ff Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Mon, 10 Feb 2025 12:21:02 +0100 Subject: [PATCH] vault: remove dead code --- contracts/vault/Timestamps.sol | 5 ----- contracts/vault/TokenFlows.sol | 24 ------------------------ contracts/vault/VaultBase.sol | 11 ++++------- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/contracts/vault/Timestamps.sol b/contracts/vault/Timestamps.sol index 20deb5b..786cd2d 100644 --- a/contracts/vault/Timestamps.sol +++ b/contracts/vault/Timestamps.sol @@ -5,7 +5,6 @@ type Timestamp is uint40; type Duration is uint40; using {_timestampEquals as ==} for Timestamp global; -using {_timestampNotEqual as !=} for Timestamp global; using {_timestampLessThan as <} for Timestamp global; using {_timestampAtMost as <=} for Timestamp global; @@ -13,10 +12,6 @@ function _timestampEquals(Timestamp a, Timestamp b) pure returns (bool) { return Timestamp.unwrap(a) == Timestamp.unwrap(b); } -function _timestampNotEqual(Timestamp a, Timestamp b) pure returns (bool) { - return Timestamp.unwrap(a) != Timestamp.unwrap(b); -} - function _timestampLessThan(Timestamp a, Timestamp b) pure returns (bool) { return Timestamp.unwrap(a) < Timestamp.unwrap(b); } diff --git a/contracts/vault/TokenFlows.sol b/contracts/vault/TokenFlows.sol index 579b55c..96aa585 100644 --- a/contracts/vault/TokenFlows.sol +++ b/contracts/vault/TokenFlows.sol @@ -8,10 +8,7 @@ type TokensPerSecond is uint96; using {_tokensPerSecondMinus as -} for TokensPerSecond global; using {_tokensPerSecondPlus as +} for TokensPerSecond global; using {_tokensPerSecondEquals as ==} for TokensPerSecond global; -using {_tokensPerSecondNotEqual as !=} for TokensPerSecond global; -using {_tokensPerSecondAtLeast as >=} for TokensPerSecond global; using {_tokensPerSecondAtMost as <=} for TokensPerSecond global; -using {_tokensPerSecondLessThan as <} for TokensPerSecond global; function _tokensPerSecondMinus( TokensPerSecond a, @@ -36,20 +33,6 @@ function _tokensPerSecondEquals( return TokensPerSecond.unwrap(a) == TokensPerSecond.unwrap(b); } -function _tokensPerSecondNotEqual( - TokensPerSecond a, - TokensPerSecond b -) pure returns (bool) { - return TokensPerSecond.unwrap(a) != TokensPerSecond.unwrap(b); -} - -function _tokensPerSecondAtLeast( - TokensPerSecond a, - TokensPerSecond b -) pure returns (bool) { - return TokensPerSecond.unwrap(a) >= TokensPerSecond.unwrap(b); -} - function _tokensPerSecondAtMost( TokensPerSecond a, TokensPerSecond b @@ -57,13 +40,6 @@ function _tokensPerSecondAtMost( return TokensPerSecond.unwrap(a) <= TokensPerSecond.unwrap(b); } -function _tokensPerSecondLessThan( - TokensPerSecond a, - TokensPerSecond b -) pure returns (bool) { - return TokensPerSecond.unwrap(a) < TokensPerSecond.unwrap(b); -} - library TokenFlows { function accumulate( TokensPerSecond rate, diff --git a/contracts/vault/VaultBase.sol b/contracts/vault/VaultBase.sol index 4605be2..44e1e9a 100644 --- a/contracts/vault/VaultBase.sol +++ b/contracts/vault/VaultBase.sol @@ -4,16 +4,13 @@ pragma solidity 0.8.28; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "./Accounts.sol"; -import "./Timestamps.sol"; -import "./TokenFlows.sol"; import "./Locks.sol"; -using SafeERC20 for IERC20; -using Timestamps for Timestamp; -using Accounts for Account; -using Locks for Lock; - abstract contract VaultBase { + using SafeERC20 for IERC20; + using Accounts for Account; + using Locks for Lock; + IERC20 internal immutable _token; type Controller is address;