Skip to content

Commit

Permalink
fix: Reorg tests files
Browse files Browse the repository at this point in the history
  • Loading branch information
@miguelmtzinf
miguelmtzinf committed Apr 19, 2024
1 parent cfa73b7 commit 62ff487
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 65 deletions.
24 changes: 12 additions & 12 deletions ...cip/test/pools/GHOTokenPoolEthereum.t.sol → ...test/pools/GHO/GHOTokenPoolEthereum.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ 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 {BaseTest} from "../BaseTest.t.sol";
import {IPool} from "../../interfaces/pools/IPool.sol";
import {LockReleaseTokenPool} from "../../pools/LockReleaseTokenPool.sol";
import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
import {Router} from "../../Router.sol";
import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
import {BaseTest} from "../../BaseTest.t.sol";
import {IPool} from "../../../interfaces/pools/IPool.sol";
import {LockReleaseTokenPool} from "../../../pools/LockReleaseTokenPool.sol";
import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
import {Router} from "../../../Router.sol";
import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
import {GHOTokenPoolEthereumSetup} from "./GHOTokenPoolEthereumSetup.t.sol";

contract GHOTokenPoolEthereum_setRebalancer is GHOTokenPoolEthereumSetup {
Expand Down
22 changes: 11 additions & 11 deletions .../test/pools/GHOTokenPoolEthereumE2E.t.sol → ...t/pools/GHO/GHOTokenPoolEthereumE2E.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ pragma solidity 0.8.19;

import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";

import "../helpers/MerkleHelper.sol";
import "../commitStore/CommitStore.t.sol";
import "../onRamp/EVM2EVMOnRampSetup.t.sol";
import "../offRamp/EVM2EVMOffRampSetup.t.sol";
import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
import "../../helpers/MerkleHelper.sol";
import "../../commitStore/CommitStore.t.sol";
import "../../onRamp/EVM2EVMOnRampSetup.t.sol";
import "../../offRamp/EVM2EVMOffRampSetup.t.sol";
import {IBurnMintERC20} from "../../../../shared/token/ERC20/IBurnMintERC20.sol";
import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {IPool} from "../../interfaces/pools/IPool.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {E2E} from "./End2End.t.sol";
import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {IPool} from "../../../interfaces/pools/IPool.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {E2E} from "../End2End.t.sol";

contract GHOTokenPoolEthereumE2E is E2E {
using Internal for Internal.EVM2EVMMessage;
Expand Down
26 changes: 13 additions & 13 deletions ...est/pools/GHOTokenPoolEthereumSetup.t.sol → ...pools/GHO/GHOTokenPoolEthereumSetup.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ 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 {BaseTest} from "../BaseTest.t.sol";
import {IPool} from "../../interfaces/pools/IPool.sol";
import {LockReleaseTokenPool} from "../../pools/LockReleaseTokenPool.sol";
import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
import {Router} from "../../Router.sol";
import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
import {RouterSetup} from "../router/RouterSetup.t.sol";
import {BaseTest} from "../../BaseTest.t.sol";
import {IPool} from "../../../interfaces/pools/IPool.sol";
import {LockReleaseTokenPool} from "../../../pools/LockReleaseTokenPool.sol";
import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
import {Router} from "../../../Router.sol";
import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
import {RouterSetup} from "../../router/RouterSetup.t.sol";

contract GHOTokenPoolEthereumSetup is RouterSetup {
IERC20 internal s_token;
Expand Down
16 changes: 8 additions & 8 deletions .../ccip/test/pools/GHOTokenPoolRemote.t.sol → ...p/test/pools/GHO/GHOTokenPoolRemote.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +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 {BaseTest} from "../BaseTest.t.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
import {BurnMintTokenPool} from "../../pools/BurnMintTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {BaseTest} from "../../BaseTest.t.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
import {BurnMintTokenPool} from "../../../pools/BurnMintTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {GHOTokenPoolRemoteSetup} from "./GHOTokenPoolRemoteSetup.t.sol";

contract GHOTokenPoolRemote_lockOrBurn is GHOTokenPoolRemoteSetup {
Expand Down
22 changes: 11 additions & 11 deletions ...ip/test/pools/GHOTokenPoolRemoteE2E.t.sol → ...est/pools/GHO/GHOTokenPoolRemoteE2E.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ pragma solidity 0.8.19;

import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";

import "../helpers/MerkleHelper.sol";
import "../commitStore/CommitStore.t.sol";
import "../onRamp/EVM2EVMOnRampSetup.t.sol";
import "../offRamp/EVM2EVMOffRampSetup.t.sol";
import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
import "../../helpers/MerkleHelper.sol";
import "../../commitStore/CommitStore.t.sol";
import "../../onRamp/EVM2EVMOnRampSetup.t.sol";
import "../../offRamp/EVM2EVMOffRampSetup.t.sol";
import {IBurnMintERC20} from "../../../../shared/token/ERC20/IBurnMintERC20.sol";
import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {IPool} from "../../interfaces/pools/IPool.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {E2E} from "./End2End.t.sol";
import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {IPool} from "../../../interfaces/pools/IPool.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {E2E} from "../End2End.t.sol";

contract GHOTokenPoolRemoteE2E is E2E {
using Internal for Internal.EVM2EVMMessage;
Expand Down
20 changes: 10 additions & 10 deletions .../test/pools/GHOTokenPoolRemoteSetup.t.sol → ...t/pools/GHO/GHOTokenPoolRemoteSetup.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ 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 {BaseTest} from "../BaseTest.t.sol";
import {TokenPool} from "../../pools/TokenPool.sol";
import {Router} from "../../Router.sol";
import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
import {BurnMintTokenPool} from "../../pools/BurnMintTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {RateLimiter} from "../../libraries/RateLimiter.sol";
import {RouterSetup} from "../router/RouterSetup.t.sol";
import {BaseTest} from "../../BaseTest.t.sol";
import {TokenPool} from "../../../pools/TokenPool.sol";
import {Router} from "../../../Router.sol";
import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
import {BurnMintTokenPool} from "../../../pools/BurnMintTokenPool.sol";
import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
import {RateLimiter} from "../../../libraries/RateLimiter.sol";
import {RouterSetup} from "../../router/RouterSetup.t.sol";

contract GHOTokenPoolRemoteSetup is RouterSetup {
event Transfer(address indexed from, address indexed to, uint256 value);
Expand Down

0 comments on commit 62ff487

Please sign in to comment.