From 5d37d67866f9e78bf73590e63dec7fd2afef12e8 Mon Sep 17 00:00:00 2001 From: kyriediculous Date: Fri, 31 May 2024 05:14:58 +0200 Subject: [PATCH] fix: dependencies --- src/utils/SelfPermit.sol | 2 +- test/UnsETH.t.sol | 2 +- test/helpers/MockERC20.sol | 18 ++++++++++++++++-- test/lpETH/LpETH.t.sol | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/utils/SelfPermit.sol b/src/utils/SelfPermit.sol index e3b448e..c4a2af8 100644 --- a/src/utils/SelfPermit.sol +++ b/src/utils/SelfPermit.sol @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT -import { ERC20 } from "solmate/tokens/ERC20.sol"; +import { ERC20 } from "solady/tokens/ERC20.sol"; pragma solidity >=0.8.20; diff --git a/test/UnsETH.t.sol b/test/UnsETH.t.sol index 057ba97..114c396 100644 --- a/test/UnsETH.t.sol +++ b/test/UnsETH.t.sol @@ -29,7 +29,7 @@ contract UnsETHTest is Test, ERC721Receiver { unsETH = UnsETH(payable(address(new ERC1967Proxy(unsETH_impl, "")))); unsETH.initialize(); - myETH = new MockERC20("MyETH", "myETH", 18); + myETH = new MockERC20("MyETH", "myETH"); myETH.mint(address(this), 1000 ether); vm.mockCall(registry, abi.encodeWithSignature("adapters(address)", (address(myETH))), abi.encode(adapter)); } diff --git a/test/helpers/MockERC20.sol b/test/helpers/MockERC20.sol index ce6efb1..86eef39 100644 --- a/test/helpers/MockERC20.sol +++ b/test/helpers/MockERC20.sol @@ -1,9 +1,23 @@ pragma solidity >=0.8.20; -import { ERC20 } from "solmate/tokens/ERC20.sol"; +import { ERC20 } from "solady/tokens/ERC20.sol"; contract MockERC20 is ERC20 { - constructor(string memory _name, string memory _symbol, uint8 _decimals) ERC20(_name, _symbol, _decimals) { } + string private _name; + string private _symbol; + + constructor(string memory name, string memory symbol) ERC20() { + _name = name; + _symbol = symbol; + } + + function name() public view override returns (string memory) { + return _name; + } + + function symbol() public view override returns (string memory) { + return _symbol; + } function mint(address to, uint256 value) public virtual { _mint(to, value); diff --git a/test/lpETH/LpETH.t.sol b/test/lpETH/LpETH.t.sol index 9ca5f66..100455e 100644 --- a/test/lpETH/LpETH.t.sol +++ b/test/lpETH/LpETH.t.sol @@ -21,8 +21,8 @@ contract LPETH_Test is Test { LpETH lpETH; function setUp() public { - token1 = new MockERC20("Token1", "T1", 18); - token2 = new MockERC20("Token 2", "T2", 18); + token1 = new MockERC20("Token1", "T1"); + token2 = new MockERC20("Token 2", "T2"); registry = new Registry(); lpToken = new LPToken(); ConstructorConfig memory config =