From ea625f8724be2e7e726c4f45303a095671c64d08 Mon Sep 17 00:00:00 2001 From: Max Weng Date: Mon, 1 Jul 2024 20:11:13 +0800 Subject: [PATCH] chg: fix test errors after merging the dev branch --- test/foundry/PureTokeAdapter.t.sol | 116 --------------------------- test/foundry/UnionLens.t.sol | 12 +-- test/integration/pureTokenAdapter.ts | 8 +- 3 files changed, 10 insertions(+), 126 deletions(-) delete mode 100644 test/foundry/PureTokeAdapter.t.sol diff --git a/test/foundry/PureTokeAdapter.t.sol b/test/foundry/PureTokeAdapter.t.sol deleted file mode 100644 index 6e110679..00000000 --- a/test/foundry/PureTokeAdapter.t.sol +++ /dev/null @@ -1,116 +0,0 @@ -pragma solidity ^0.8.0; - -import {TestWrapper} from "./TestWrapper.sol"; -import {PureTokenAdapter} from "union-v2-contracts/asset/PureTokenAdapter.sol"; -import {Controller} from "union-v2-contracts/Controller.sol"; - -contract TestPureTokenAdapter is TestWrapper { - PureTokenAdapter public pureToken; - - function setUp() public virtual { - address logic = address(new PureTokenAdapter()); - - deployMocks(); - - pureToken = PureTokenAdapter( - deployProxy(logic, abi.encodeWithSignature("__PureTokenAdapter_init(address)", [address(assetManagerMock)])) - ); - } - - function supplyToken(uint256 supplyAmount) public { - daiMock.mint(address(pureToken), supplyAmount); - } - - function testSetAssetManager(address assetManager) public { - pureToken.setAssetManager(assetManager); - assertEq(assetManager, pureToken.assetManager()); - } - - function testCannotSetAssetManagerNonAdmin() public { - vm.prank(address(1)); - vm.expectRevert(Controller.SenderNotAdmin.selector); - pureToken.setAssetManager(address(1)); - } - - function testSetFloor(address token, uint256 amount) public { - pureToken.setFloor(token, amount); - assertEq(pureToken.floorMap(token), amount); - } - - function testCannotSetFloorNonAdmin() public { - vm.prank(address(1)); - vm.expectRevert(Controller.SenderNotAdmin.selector); - pureToken.setFloor(address(1), 0); - } - - function testSetCeiling(address token, uint256 amount) public { - pureToken.setCeiling(token, amount); - assertEq(pureToken.ceilingMap(token), amount); - } - - function testCannotSetCeilingNonAdmin() public { - vm.prank(address(1)); - vm.expectRevert(Controller.SenderNotAdmin.selector); - pureToken.setCeiling(address(1), 0); - } - - function testGetRate() public { - assertEq(0, pureToken.getRate(address(0))); - } - - function testGetSupply(uint256 amount) public { - supplyToken(amount); - assertEq(amount, pureToken.getSupply(address(daiMock))); - } - - function testGetSupplyView(uint256 amount) public { - supplyToken(amount); - assertEq(amount, pureToken.getSupplyView(address(daiMock))); - } - - function testSupportsToken() public { - pureToken.supportsToken(address(pureToken)); - assert(pureToken.supportsToken(address(daiMock))); - } - - function testDeposit() public { - // nothing to assert just check this passes - pureToken.deposit(address(daiMock)); - } - - function testWithdraw(uint256 amount) public { - address recipient = address(123); - daiMock.mint(address(pureToken), amount); - assertEq(daiMock.balanceOf(recipient), 0); - vm.prank(pureToken.assetManager()); - pureToken.withdraw(address(daiMock), recipient, amount); - assertEq(daiMock.balanceOf(recipient), amount); - } - - function testCannotWithdrawNonAssetManager(uint256 amount) public { - address recipient = address(123); - daiMock.mint(address(pureToken), amount); - vm.expectRevert(PureTokenAdapter.SenderNotAssetManager.selector); - pureToken.withdraw(address(daiMock), recipient, amount); - } - - function testWithdrawAll(uint256 amount) public { - address recipient = address(123); - daiMock.mint(address(pureToken), amount); - assertEq(daiMock.balanceOf(recipient), 0); - vm.prank(pureToken.assetManager()); - pureToken.withdrawAll(address(daiMock), recipient); - assertEq(daiMock.balanceOf(recipient), amount); - } - - function testCannotWithdrawAllNonAssetManager(address recipient, uint256 amount) public { - daiMock.mint(address(pureToken), amount); - vm.expectRevert(PureTokenAdapter.SenderNotAssetManager.selector); - pureToken.withdrawAll(address(daiMock), recipient); - } - - function testClaimRewards() public { - // nothing to assert just check this passes - pureToken.claimRewards(address(daiMock), address(0)); - } -} diff --git a/test/foundry/UnionLens.t.sol b/test/foundry/UnionLens.t.sol index fd376389..ae682c75 100644 --- a/test/foundry/UnionLens.t.sol +++ b/test/foundry/UnionLens.t.sol @@ -10,28 +10,28 @@ contract TestUnionLens is TestWrapper { function setUp() public virtual { deployMocks(); vm.startPrank(ADMIN); - marketRegistryMock.setUToken(address(daiMock), address(uTokenMock)); - marketRegistryMock.setUserManager(address(daiMock), address(userManagerMock)); + marketRegistryMock.setUToken(address(erc20Mock), address(uTokenMock)); + marketRegistryMock.setUserManager(address(erc20Mock), address(userManagerMock)); vm.stopPrank(); unionLens = new UnionLens(marketRegistryMock); } function testGetStakerAddresses() public { - address[] memory addresses = unionLens.getStakerAddresses(address(daiMock), address(1)); + address[] memory addresses = unionLens.getStakerAddresses(address(erc20Mock), address(1)); assertEq(addresses.length, 0); userManagerMock.updateTrust(address(1), 1 ether); - addresses = unionLens.getStakerAddresses(address(daiMock), address(1)); + addresses = unionLens.getStakerAddresses(address(erc20Mock), address(1)); assertEq(addresses.length, 1); } function testGetBorrowerAddresses() public { - address[] memory addresses = unionLens.getBorrowerAddresses(address(daiMock), address(1)); + address[] memory addresses = unionLens.getBorrowerAddresses(address(erc20Mock), address(1)); assertEq(addresses.length, 0); vm.startPrank(address(1)); userManagerMock.updateTrust(address(2), 1 ether); - addresses = unionLens.getBorrowerAddresses(address(daiMock), address(1)); + addresses = unionLens.getBorrowerAddresses(address(erc20Mock), address(1)); assertEq(addresses.length, 1); vm.stopPrank(); } diff --git a/test/integration/pureTokenAdapter.ts b/test/integration/pureTokenAdapter.ts index 90e9641f..ce16cd30 100644 --- a/test/integration/pureTokenAdapter.ts +++ b/test/integration/pureTokenAdapter.ts @@ -48,8 +48,8 @@ describe("Pure Token Adapter", () => { await getDai(contracts.dai, staker, mintAmount); await contracts.dai.connect(staker).approve(contracts.userManager.address, ethers.constants.MaxUint256); - adapter = contracts.adapters.pureToken; - await contracts.adapters.pureToken.setCeiling(contracts.dai.address, ethers.constants.MaxUint256); + adapter = contracts.adapters.pureTokenAdapter; + await adapter.setCeiling(contracts.dai.address, ethers.constants.MaxUint256); await contracts.userManager.connect(staker).stake(stakeAmount); await helpers.updateTrust(staker, borrower, stakeAmount); }; @@ -81,10 +81,10 @@ describe("Pure Token Adapter", () => { }); it("cannot borrow if overdue", async () => { - await helpers.withOverdueblocks(1, async () => { + await helpers.withOverdue(1, async () => { const minBorrow = await contracts.uToken.minBorrow(); const resp = helpers.borrow(borrower, minBorrow); - await expect(resp).to.be.revertedWith("MemberIsOverdue()"); + await expect(resp).to.be.revertedWithCustomError(contracts.uToken, "MemberIsOverdue"); }); });