From 778ca499f1a4ff0475249ddc6b360529a6c95fad Mon Sep 17 00:00:00 2001
From: Daniel Wang <99078276+dantaik@users.noreply.github.com>
Date: Tue, 30 Jan 2024 18:33:54 +0800
Subject: [PATCH] refactor(protocol): move contracts/test to test/common/
 (#15612)

---
 packages/protocol/genesis/GenerateGenesis.g.sol               | 2 +-
 packages/protocol/script/DeployOnL1.s.sol                     | 4 ++--
 packages/protocol/test/TaikoTest.sol                          | 2 +-
 .../{contracts/test => test/common}/erc20/FreeMintERC20.sol   | 0
 .../test => test/common}/erc20/MayFailFreeMintERC20.sol       | 0
 .../{contracts/test => test/common}/erc20/RegularERC20.sol    | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/protocol/{contracts/test => test/common}/erc20/FreeMintERC20.sol (100%)
 rename packages/protocol/{contracts/test => test/common}/erc20/MayFailFreeMintERC20.sol (100%)
 rename packages/protocol/{contracts/test => test/common}/erc20/RegularERC20.sol (100%)

diff --git a/packages/protocol/genesis/GenerateGenesis.g.sol b/packages/protocol/genesis/GenerateGenesis.g.sol
index 4b6905357db..7d48ddca534 100644
--- a/packages/protocol/genesis/GenerateGenesis.g.sol
+++ b/packages/protocol/genesis/GenerateGenesis.g.sol
@@ -9,9 +9,9 @@ import "../contracts/bridge/Bridge.sol";
 import "../contracts/tokenvault/ERC1155Vault.sol";
 import "../contracts/tokenvault/ERC20Vault.sol";
 import "../contracts/tokenvault/ERC721Vault.sol";
-import "../contracts/test/erc20/RegularERC20.sol";
 import "../contracts/signal/SignalService.sol";
 import "../contracts/L2/TaikoL2.sol";
+import "../test/common/erc20/RegularERC20.sol";
 
 contract TestGenerateGenesis is Test, AddressResolver {
     using stdJson for string;
diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
index b51246b854e..d9c0243ecad 100644
--- a/packages/protocol/script/DeployOnL1.s.sol
+++ b/packages/protocol/script/DeployOnL1.s.sol
@@ -33,8 +33,8 @@ import "../contracts/tokenvault/ERC20Vault.sol";
 import "../contracts/tokenvault/ERC1155Vault.sol";
 import "../contracts/tokenvault/ERC721Vault.sol";
 import "../contracts/signal/SignalService.sol";
-import "../contracts/test/erc20/FreeMintERC20.sol";
-import "../contracts/test/erc20/MayFailFreeMintERC20.sol";
+import "../test/common/erc20/FreeMintERC20.sol";
+import "../test/common/erc20/MayFailFreeMintERC20.sol";
 import "../test/DeployCapability.sol";
 
 /// @title DeployOnL1
diff --git a/packages/protocol/test/TaikoTest.sol b/packages/protocol/test/TaikoTest.sol
index 919718f1a83..7c36b255a9d 100644
--- a/packages/protocol/test/TaikoTest.sol
+++ b/packages/protocol/test/TaikoTest.sol
@@ -37,7 +37,7 @@ import "../contracts/team/TimelockTokenPool.sol";
 import "../contracts/team/airdrop/ERC20Airdrop.sol";
 import "../contracts/team/airdrop/ERC20Airdrop2.sol";
 
-import "../contracts/test/erc20/FreeMintERC20.sol";
+import "../test/common/erc20/FreeMintERC20.sol";
 
 import "./DeployCapability.sol";
 import "./HelperContracts.sol";
diff --git a/packages/protocol/contracts/test/erc20/FreeMintERC20.sol b/packages/protocol/test/common/erc20/FreeMintERC20.sol
similarity index 100%
rename from packages/protocol/contracts/test/erc20/FreeMintERC20.sol
rename to packages/protocol/test/common/erc20/FreeMintERC20.sol
diff --git a/packages/protocol/contracts/test/erc20/MayFailFreeMintERC20.sol b/packages/protocol/test/common/erc20/MayFailFreeMintERC20.sol
similarity index 100%
rename from packages/protocol/contracts/test/erc20/MayFailFreeMintERC20.sol
rename to packages/protocol/test/common/erc20/MayFailFreeMintERC20.sol
diff --git a/packages/protocol/contracts/test/erc20/RegularERC20.sol b/packages/protocol/test/common/erc20/RegularERC20.sol
similarity index 100%
rename from packages/protocol/contracts/test/erc20/RegularERC20.sol
rename to packages/protocol/test/common/erc20/RegularERC20.sol