Merge branch 'main' into fix/combine-actions

defi-wonderland · Nov 22, 2023 · 69116a3 · 69116a3
2 parents 22438ea + f66819f
commit 69116a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/solidity/test/e2e/Greeter.t.sol → solidity/test/integration/Greeter.t.sol b/solidity/test/e2e/Greeter.t.sol → 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 → ...dity/test/integration/IntegrationBase.sol b/solidity/test/e2e/Common.sol → ...dity/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';