From 9b2fa3c1a51a1c797f55cfef67383b1375346c84 Mon Sep 17 00:00:00 2001 From: DhairyaSethi <55102840+DhairyaSethi@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:19:12 +0530 Subject: [PATCH] chore: fix import order --- .../v0.8/ccip/test/pools/GHO/GhoTokenPoolEthereum.t.sol | 9 ++++----- .../v0.8/ccip/test/pools/GHO/GhoTokenPoolRemote.t.sol | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolEthereum.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolEthereum.t.sol index 9017937097..149a90e0ec 100644 --- a/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolEthereum.t.sol +++ b/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolEthereum.t.sol @@ -2,18 +2,17 @@ pragma solidity ^0.8.0; import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol"; - import {stdError} from "forge-std/Test.sol"; -import {MockUpgradeable} from "../../mocks/MockUpgradeable.sol"; -import {IPoolV1} from "../../../interfaces/IPool.sol"; +import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol"; import {ILiquidityContainer} from "../../../../liquiditymanager/interfaces/ILiquidityContainer.sol"; +import {IPoolV1} from "../../../interfaces/IPool.sol"; import {Pool} from "../../../libraries/Pool.sol"; import {LockReleaseTokenPool} from "../../../pools/LockReleaseTokenPool.sol"; import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol"; import {UpgradeableTokenPool} from "../../../pools/GHO/UpgradeableTokenPool.sol"; import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol"; import {RateLimiter} from "../../../libraries/RateLimiter.sol"; -import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol"; +import {MockUpgradeable} from "../../mocks/MockUpgradeable.sol"; import {GhoTokenPoolEthereumSetup} from "./GhoTokenPoolEthereumSetup.t.sol"; contract GhoTokenPoolEthereum_setRebalancer is GhoTokenPoolEthereumSetup { @@ -374,7 +373,7 @@ contract GhoTokenPoolEthereum_releaseOrMint is GhoTokenPoolEthereumSetup { ); } - function testBridgedAmountNoEnoughReverts() public { + function testBridgedAmountNotEnoughReverts() public { uint256 amount = 10; vm.expectRevert(abi.encodeWithSelector(UpgradeableLockReleaseTokenPool.NotEnoughBridgedAmount.selector)); vm.startPrank(s_allowedOffRamp); diff --git a/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolRemote.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolRemote.t.sol index d6aa1a07ea..1b52b6d1bc 100644 --- a/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolRemote.t.sol +++ b/contracts/src/v0.8/ccip/test/pools/GHO/GhoTokenPoolRemote.t.sol @@ -5,13 +5,14 @@ import {GhoToken} from "@aave-gho-core/gho/GhoToken.sol"; import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol"; import {stdError} from "forge-std/Test.sol"; -import {MockUpgradeable} from "../../mocks/MockUpgradeable.sol"; import {UpgradeableTokenPool} from "../../../pools/GHO/UpgradeableTokenPool.sol"; import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol"; import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol"; import {BurnMintTokenPool} from "../../../pools/BurnMintTokenPool.sol"; import {RateLimiter} from "../../../libraries/RateLimiter.sol"; import {Pool} from "../../../libraries/Pool.sol"; +import {MockUpgradeable} from "../../mocks/MockUpgradeable.sol"; + import {GhoTokenPoolRemoteSetup} from "./GhoTokenPoolRemoteSetup.t.sol"; contract GhoTokenPoolRemote_lockOrBurn is GhoTokenPoolRemoteSetup {