fix imports

ethena-labs · Nov 1, 2024 · 347f8ed · 347f8ed
1 parent 11ca730
commit 347f8ed
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git 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
@@ -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,17 +1489,13 @@ 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);
         vm.stopPrank();
     }
 
     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
@@ -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
@@ -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
@@ -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 {