From 1df41b342beecfc8c57f1d6aed420d44b0f6ec77 Mon Sep 17 00:00:00 2001 From: Dristpunk Date: Wed, 15 Nov 2023 17:18:41 +0300 Subject: [PATCH] style: rename tests --- out/Greeter.sol/Greeter.json | 14 +++++++------- solidity/test/{e2e => integration}/Greeter.t.sol | 4 ++-- .../Common.sol => integration/IntegrationBase.sol} | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) rename solidity/test/{e2e => integration}/Greeter.t.sol (73%) rename solidity/test/{e2e/Common.sol => integration/IntegrationBase.sol} (94%) diff --git a/out/Greeter.sol/Greeter.json b/out/Greeter.sol/Greeter.json index abdc48ab..46c60b56 100644 --- a/out/Greeter.sol/Greeter.json +++ b/out/Greeter.sol/Greeter.json @@ -307,13 +307,13 @@ }, "settings": { "remappings": [ - ":contracts/=solidity/contracts/", - ":ds-test/=node_modules/ds-test/src/", - ":forge-std/=node_modules/forge-std/src/", - ":interfaces/=solidity/interfaces/", - ":isolmate/=node_modules/isolmate/src/", - ":prb/test/=node_modules/prb/test/src/", - ":test/=solidity/test/" + "contracts/=solidity/contracts/", + "ds-test/=node_modules/ds-test/src/", + "forge-std/=node_modules/forge-std/src/", + "interfaces/=solidity/interfaces/", + "isolmate/=node_modules/isolmate/src/", + "prb/test/=node_modules/prb/test/src/", + "test/=solidity/test/" ], "optimizer": { "enabled": true, diff --git a/solidity/test/e2e/Greeter.t.sol b/solidity/test/integration/Greeter.t.sol similarity index 73% rename from solidity/test/e2e/Greeter.t.sol rename to solidity/test/integration/Greeter.t.sol index 6d20fdf1..674b07d1 100644 --- a/solidity/test/e2e/Greeter.t.sol +++ b/solidity/test/integration/Greeter.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity =0.8.19; -import {CommonE2EBase} from 'test/e2e/Common.sol'; +import {IntegrationBase} from 'test/integration/IntegrationBase.sol'; -contract E2EGreeter is CommonE2EBase { +contract IntegrationGreeter is IntegrationBase { function test_Greet() public { uint256 _whaleBalance = _dai.balanceOf(_daiWhale); diff --git a/solidity/test/e2e/Common.sol b/solidity/test/integration/IntegrationBase.sol similarity index 94% rename from solidity/test/e2e/Common.sol rename to solidity/test/integration/IntegrationBase.sol index 3efcfb75..2c1646dc 100644 --- a/solidity/test/e2e/Common.sol +++ b/solidity/test/integration/IntegrationBase.sol @@ -6,7 +6,7 @@ import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol'; import {Greeter, IGreeter} from 'contracts/Greeter.sol'; -contract CommonE2EBase is DSTestFull { +contract IntegrationBase is DSTestFull { uint256 internal constant _FORK_BLOCK = 15_452_788; string internal _initialGreeting = 'hola';