add unit tests for addWhitelistTokens

imua-xyz · Jun 18, 2024 · f7e4a1c · f7e4a1c
1 parent 0c69265
commit f7e4a1c
Show file tree

Hide file tree

Showing 9 changed files with 386 additions and 212 deletions.
diff --git a/script/integration/1_DeployBootstrap.s.sol b/script/integration/1_DeployBootstrap.s.sol
@@ -16,7 +16,7 @@ import {CustomProxyAdmin} from "../../src/core/CustomProxyAdmin.sol";
 import {Vault} from "../../src/core/Vault.sol";
 import {IOperatorRegistry} from "../../src/interfaces/IOperatorRegistry.sol";
 import {IVault} from "../../src/interfaces/IVault.sol";
-import {MyToken} from "../../test/foundry/MyToken.sol";
+import {MyToken} from "../../test/foundry/unit/MyToken.sol";
 
 // Technically this is used for testing but it is marked as a script
 // because it is a script that is used to deploy the contracts on Anvil

diff --git a/src/core/ClientChainGateway.sol b/src/core/ClientChainGateway.sol
@@ -130,7 +130,7 @@ contract ClientChainGateway is
         for (uint256 i; i < tokens.length; i++) {
             address token = tokens[i];
             require(token != address(0), "ClientChainGateway: zero token address");
-            require(!isWhitelistedToken[token], "ClientChainGateway: token should be not whitelisted before");
+            require(!isWhitelistedToken[token], "ClientChainGateway: token should not be whitelisted before");
 
             actionArgs = abi.encodePacked(actionArgs, bytes32(bytes20(token)));
         }

diff --git a/test/foundry/ClientChainGateway.t.sol b/test/foundry/ClientChainGateway.t.sol
diff --git a/test/foundry/Bootstrap.t.sol → test/foundry/unit/Bootstrap.t.sol b/test/foundry/Bootstrap.t.sol → test/foundry/unit/Bootstrap.t.sol
@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Bootstrap} from "../../src/core/Bootstrap.sol";
-import {ClientChainGateway} from "../../src/core/ClientChainGateway.sol";
-import {CustomProxyAdmin} from "../../src/core/CustomProxyAdmin.sol";
-import {Vault} from "../../src/core/Vault.sol";
-
-import {IOperatorRegistry} from "../../src/interfaces/IOperatorRegistry.sol";
-
-import {IVault} from "../../src/interfaces/IVault.sol";
-import {Origin} from "../../src/lzApp/OAppReceiverUpgradeable.sol";
-import {BootstrapStorage} from "../../src/storage/BootstrapStorage.sol";
-import {GatewayStorage} from "../../src/storage/GatewayStorage.sol";
-import {NonShortCircuitEndpointV2Mock} from "../mocks/NonShortCircuitEndpointV2Mock.sol";
+import {Bootstrap} from "src/core/Bootstrap.sol";
+import {ClientChainGateway} from "src/core/ClientChainGateway.sol";
+import {CustomProxyAdmin} from "src/core/CustomProxyAdmin.sol";
+import {Vault} from "src/core/Vault.sol";
+
+import {IOperatorRegistry} from "src/interfaces/IOperatorRegistry.sol";
+
+import {NonShortCircuitEndpointV2Mock} from "../../mocks/NonShortCircuitEndpointV2Mock.sol";
 import {MyToken} from "./MyToken.sol";
+import {IVault} from "src/interfaces/IVault.sol";
+import {Origin} from "src/lzApp/OAppReceiverUpgradeable.sol";
+import {BootstrapStorage} from "src/storage/BootstrapStorage.sol";
+import {GatewayStorage} from "src/storage/GatewayStorage.sol";
 
 import "@layerzerolabs/lz-evm-protocol-v2/contracts/libs/GUID.sol";