From 347f8ede54112ed710d56119e3c0c338d431c2fb Mon Sep 17 00:00:00 2001 From: iethena Date: Fri, 1 Nov 2024 09:35:23 +0000 Subject: [PATCH] fix imports --- test/foundry/UStb.admin.t.sol | 4 ++-- test/foundry/UStb.transfers.t.sol | 8 ++------ test/foundry/UStbBaseSetup.sol | 11 +++++------ test/foundry/UStbMintingBaseSetup.sol | 22 +++++++++++----------- test/foundry/test/UStbMinting.ACL.t.sol | 6 +++--- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/test/foundry/UStb.admin.t.sol b/test/foundry/UStb.admin.t.sol index 456e4a8..587c2a6 100644 --- a/test/foundry/UStb.admin.t.sol +++ b/test/foundry/UStb.admin.t.sol @@ -9,8 +9,8 @@ import {console} from "forge-std/console.sol"; import "forge-std/Test.sol"; import {SigUtils} from "../utils/SigUtils.sol"; -import "../../../contracts/ustb/UStb.sol"; -import "../../../contracts/ustb/IUStbDefinitions.sol"; +import "../../contracts/ustb/UStb.sol"; +import "../../contracts/ustb/IUStbDefinitions.sol"; import {UStbBaseSetup} from "./UStbBaseSetup.sol"; contract UStbTest is UStbBaseSetup { diff --git a/test/foundry/UStb.transfers.t.sol b/test/foundry/UStb.transfers.t.sol index 51d13f0..d0d2e35 100644 --- a/test/foundry/UStb.transfers.t.sol +++ b/test/foundry/UStb.transfers.t.sol @@ -9,8 +9,8 @@ import {console} from "forge-std/console.sol"; import "forge-std/Test.sol"; import {SigUtils} from "../utils/SigUtils.sol"; -import "../../../contracts/ustb/UStb.sol"; -import "../../../contracts/ustb/IUStbDefinitions.sol"; +import "../../contracts/ustb/UStb.sol"; +import "../../contracts/ustb/IUStbDefinitions.sol"; import {UStbBaseSetup} from "./UStbBaseSetup.sol"; contract UStbTransferTest is UStbBaseSetup { @@ -1489,8 +1489,6 @@ contract UStbTransferTest is UStbBaseSetup { } function testRedistributeLockedAmountNotBlacklistedFromFails() public { - uint256 aliceBalance = UStbContract.balanceOf(alice); - uint256 bobBalance = UStbContract.balanceOf(bob); vm.startPrank(newOwner); vm.expectRevert(IUStbDefinitions.OperationNotAllowed.selector); UStbContract.redistributeLockedAmount(alice, bob); @@ -1498,8 +1496,6 @@ contract UStbTransferTest is UStbBaseSetup { } function testRedistributeLockedAmountBlacklistedToFails() public { - uint256 aliceBalance = UStbContract.balanceOf(alice); - uint256 bobBalance = UStbContract.balanceOf(bob); vm.startPrank(newOwner); UStbContract.grantRole(BLACKLISTED_ROLE, bob); vm.expectRevert(IUStbDefinitions.OperationNotAllowed.selector); diff --git a/test/foundry/UStbBaseSetup.sol b/test/foundry/UStbBaseSetup.sol index 0dc5748..5cc93e9 100644 --- a/test/foundry/UStbBaseSetup.sol +++ b/test/foundry/UStbBaseSetup.sol @@ -8,18 +8,17 @@ pragma solidity 0.8.26; import {stdStorage, StdStorage, Test} from "forge-std/Test.sol"; import {Vm} from "forge-std/Vm.sol"; -// import "../../../contracts/mock/MockToken.sol"; -import "../../../contracts/interfaces/ISingleAdminAccessControl.sol"; +import "../../contracts/interfaces/ISingleAdminAccessControl.sol"; import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol"; import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; -import {Upgrades} from "../../../contracts/lib/Upgrades.sol"; -import {UStb} from "../../../contracts/ustb/UStb.sol"; -import {IUStb} from "../../../contracts/ustb/IUStb.sol"; +import {Upgrades} from "../../contracts/lib/Upgrades.sol"; +import {UStb} from "../../contracts/ustb/UStb.sol"; +import {IUStb} from "../../contracts/ustb/IUStb.sol"; -import "../../../test/utils/SigUtils.sol"; +import "../../test/utils/SigUtils.sol"; contract UStbBaseSetup is Test { diff --git a/test/foundry/UStbMintingBaseSetup.sol b/test/foundry/UStbMintingBaseSetup.sol index e19a058..40bdfe4 100644 --- a/test/foundry/UStbMintingBaseSetup.sol +++ b/test/foundry/UStbMintingBaseSetup.sol @@ -9,17 +9,17 @@ import {stdStorage, StdStorage, Test} from "forge-std/Test.sol"; import {SigUtils} from "../utils/SigUtils.sol"; import {Vm} from "forge-std/Vm.sol"; import {Utils} from "../utils/Utils.sol"; -import {Upgrades} from "../../../contracts/lib/Upgrades.sol"; - -import "../../../contracts/mock/MockToken.sol"; -import "../../../contracts/ustb/UStb.sol"; -import "../../../contracts/ustb/IUStbMinting.sol"; -import "../../../contracts/ustb/IUStbMintingEvents.sol"; -import "../../../contracts/ustb/UStbMinting.sol"; -import "../../../contracts/interfaces/ISingleAdminAccessControl.sol"; -import "../../../contracts/ustb/IUStbDefinitions.sol"; -import "../../../contracts/mock/MockMultisigWallet.sol"; -import "../../../contracts/ustb/IUStbDefinitions.sol"; +import {Upgrades} from "../../contracts/lib/Upgrades.sol"; + +import "../../contracts/mock/MockToken.sol"; +import "../../contracts/ustb/UStb.sol"; +import "../../contracts/ustb/IUStbMinting.sol"; +import "../../contracts/ustb/IUStbMintingEvents.sol"; +import "../../contracts/ustb/UStbMinting.sol"; +import "../../contracts/interfaces/ISingleAdminAccessControl.sol"; +import "../../contracts/ustb/IUStbDefinitions.sol"; +import "../../contracts/mock/MockMultisigWallet.sol"; +import "../../contracts/ustb/IUStbDefinitions.sol"; contract UStbMintingBaseSetup is Test, IUStbMintingEvents, IUStbDefinitions { Utils internal utils; diff --git a/test/foundry/test/UStbMinting.ACL.t.sol b/test/foundry/test/UStbMinting.ACL.t.sol index bd7b7fa..ccdf4cf 100644 --- a/test/foundry/test/UStbMinting.ACL.t.sol +++ b/test/foundry/test/UStbMinting.ACL.t.sol @@ -4,10 +4,10 @@ pragma solidity ^0.8.20; /* solhint-disable func-name-mixedcase */ import "../UStbMinting.utils.sol"; -import "../../../../contracts/ustb/IUStbMinting.sol"; -import "../../../../contracts/interfaces/ISingleAdminAccessControl.sol"; +import "../../../contracts/ustb/IUStbMinting.sol"; +import "../../../contracts/interfaces/ISingleAdminAccessControl.sol"; import "@openzeppelin/contracts/utils/Strings.sol"; -import "../../../../contracts/ustb/IUStbMinting.sol"; +import "../../../contracts/ustb/IUStbMinting.sol"; contract UStbMintingACLTest is UStbMintingUtils { function setUp() public override {