change Utils08 filename

packages/protocol/test-sol/utils08.sol → packages/protocol/test-sol/TestWithutils08.sol

@@ -10,7 +10,7 @@ import "@celo-contracts-8/common/mocks/EpochManager_WithMocks.sol";
 import "@celo-contracts-8/common/IsL2Check.sol";
 import "@celo-contracts-8/common/PrecompilesOverrideV2.sol";
 
-contract Utils08 is ForgeTest, TestConstants, IsL2Check, PrecompilesOverrideV2 {
+contract TestWithUtils08 is ForgeTest, TestConstants, IsL2Check, PrecompilesOverrideV2 {
   IRegistry registry;
   PrecompileHandler ph;
   EpochManager_WithMocks public epochManager;

packages/protocol/test-sol/devchain/e2e/common/EpochManager.t.sol

@@ -39,7 +39,7 @@ contract E2E_EpochManager is ECDSAHelper08, Devchain {
 
   EnumerableSet.AddressSet internal electedGroupsHelper;
 
-  function setUp() public virtual override(Devchain, Utils08) {
+  function setUp() public virtual override(Devchain, TestWithUtils08) {
     epochManagerOwner = Ownable(address(epochManagerContract)).owner();
     epochManagerEnabler = registryContract.getAddressForOrDie(EPOCH_MANAGER_ENABLER_REGISTRY_ID);
     firstElected = getValidators().getRegisteredValidators();

packages/protocol/test-sol/devchain/e2e/utils.sol

@@ -14,9 +14,9 @@ import "@celo-contracts-8/common/FeeCurrencyDirectory.sol";
 import "@celo-contracts/stability/interfaces/ISortedOracles.sol";
 import "@celo-contracts/common/interfaces/ICeloUnreleasedTreasury.sol";
 
-import "@test-sol/utils08.sol";
+import "@test-sol/TestWithUtils08.sol";
 
-contract Devchain is Utils08 {
+contract Devchain is TestWithUtils08 {
   // All core contracts that are expected to be in the Registry on the devchain
   ISortedOracles sortedOracles;
   FeeCurrencyDirectory feeCurrencyDirectory;

packages/protocol/test-sol/devchain/migration/Migration.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.0 <0.8.20;
 
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 
 import { MigrationsConstants } from "@migrations-sol/constants.sol";
 
@@ -23,7 +23,7 @@ import "@openzeppelin/contracts8/token/ERC20/IERC20.sol";
 
 import { console2 } from "forge-std-8/console2.sol";
 
-contract IntegrationTest is Utils08 {
+contract IntegrationTest is TestWithUtils08 {
   uint256 constant RESERVE_BALANCE = 69411663406170917420347916; // current as of 08/20/24
 
   function setUp() public virtual override {

packages/protocol/test-sol/unit/common/EpochManager.t.sol

@@ -15,10 +15,10 @@ import { IMockValidators } from "@celo-contracts-8/governance/test/IMockValidato
 import { EpochRewardsMock08 } from "@celo-contracts-8/governance/test/EpochRewardsMock.sol";
 import "@celo-contracts-8/stability/test/MockStableToken.sol";
 
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 import { ValidatorsMock } from "@test-sol/unit/governance/validators/mocks/ValidatorsMock.sol";
 
-contract EpochManagerTest is Utils08 {
+contract EpochManagerTest is TestWithUtils08 {
   EpochManager_WithMocks epochManagerContract;
   MockSortedOracles sortedOracles;
 

packages/protocol/test-sol/unit/common/EpochManagerEnabler.t.sol

@@ -9,11 +9,11 @@ import "@celo-contracts-8/common/test/MockCeloToken.sol";
 import { MockCeloUnreleasedTreasury } from "@celo-contracts-8/common/test/MockCeloUnreleasedTreasury.sol";
 import { EpochRewardsMock08 } from "@celo-contracts-8/governance/test/EpochRewardsMock.sol";
 
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 import { EpochManagerEnablerMock } from "@test-sol/mocks/EpochManagerEnablerMock.sol";
 import { ValidatorsMock } from "@test-sol/unit/governance/validators/mocks/ValidatorsMock.sol";
 
-contract EpochManagerEnablerTest is Utils08 {
+contract EpochManagerEnablerTest is TestWithUtils08 {
   EpochManagerEnablerMock epochManagerEnablerContract;
   MockCeloUnreleasedTreasury celoUnreleasedTreasury;
   MockCeloToken08 celoToken;

packages/protocol/test-sol/unit/common/FeeCurrencyDirectory.t.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.7 <0.8.20;
 
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 import "@test-sol/utils/WhenL2-08.sol";
 
 import "@celo-contracts-8/common/FeeCurrencyDirectory.sol";
 import "@celo-contracts-8/common/mocks/MockOracle.sol";
 
-contract FeeCurrencyDirectoryTest is Utils08 {
+contract FeeCurrencyDirectoryTest is TestWithUtils08 {
   FeeCurrencyDirectory directory;
   MockOracle oracle;
   address nonOwner;

packages/protocol/test-sol/unit/common/ProxyFactory08.t.sol

@@ -4,9 +4,9 @@ pragma solidity ^0.8.15;
 import "@celo-contracts-8/common/ProxyFactory08.sol";
 import "@celo-contracts/common/interfaces/IProxy.sol";
 
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 
-contract ProxyFactoryTest is Utils08 {
+contract ProxyFactoryTest is TestWithUtils08 {
   ProxyFactory08 proxyFactory08;
   bytes proxyInitCode;
   address constant owner = address(0xAA963FC97281d9632d96700aB62A4D1340F9a28a);

packages/protocol/test-sol/utils/ECDSAHelper08.sol

@@ -1,8 +1,8 @@
 pragma solidity >=0.5.13 <0.8.20;
-import { Utils08 } from "@test-sol/utils08.sol";
+import { TestWithUtils08 } from "@test-sol/TestWithUtils08.sol";
 import "@test-sol/utils/SECP256K1.sol";
 
-contract ECDSAHelper08 is Utils08 {
+contract ECDSAHelper08 is TestWithUtils08 {
   ISECP256K1 sECP256K1;
 
   function addressToPublicKey(

packages/protocol/test-sol/utils/WhenL2-08.sol

@@ -1,9 +1,9 @@
 pragma solidity >=0.5.13 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "@test-sol/utils08.sol";
+import "@test-sol/TestWithUtils08.sol";
 
-contract WhenL2 is Utils08 {
+contract WhenL2 is TestWithUtils08 {
   function setUp() public virtual override {
     super.setUp();
     whenL2WithEpochManagerInitialization();