fixed ∆ from merge conflict

celo-org · Nov 20, 2024 · 8d10061 · 8d10061
1 parent e60faff
commit 8d10061
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/protocol/test-sol/unit/common/GoldToken.t.sol b/packages/protocol/test-sol/unit/common/GoldToken.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.5.13;
 
 import "@celo-contracts/common/GoldToken.sol";
 
-import { Utils } from "@test-sol/utils.sol";
+import { TestWithUtils } from "@test-sol/TestWithUtils.sol";
 import "@test-sol/utils/WhenL2.sol";
 
-contract CeloTokenTest is Utils {
+contract CeloTokenTest is TestWithUtils {
   GoldToken celoToken;
 
   uint256 constant ONE_CELOTOKEN = 1000000000000000000;

diff --git a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol
@@ -13,6 +13,7 @@ import { MockStableToken } from "@celo-contracts/stability/test/MockStableToken.
 import { CeloTokenMock } from "@test-sol/unit/common/CeloTokenMock.sol";
 
 import { TestWithUtils } from "@test-sol/TestWithUtils.sol";
+import "@test-sol/utils/WhenL2.sol";
 
 contract EpochRewardsTest is TestWithUtils {
   uint256 constant targetVotingYieldParamsInitial = 0.00016e24; // 0.00016