From 31c25f7e351a616fab6db8dd11e3dd523d42cdc6 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:19:51 -0500 Subject: [PATCH 1/5] renamed utils contract --- .../protocol/test-sol/devchain/migration/05Links.sol | 7 ++----- .../test-sol/integration/RevokeCeloAfterL2Transition.sol | 9 +++------ .../protocol/test-sol/{utils.sol => testWithUtils.sol} | 2 +- packages/protocol/test-sol/unit/common/Accounts.t.sol | 6 ++---- packages/protocol/test-sol/unit/common/Proxy.t.sol | 7 ++----- .../unit/governance/network/BlockchainParameters.t.sol | 7 ++----- .../test-sol/unit/governance/network/EpochRewards.t.sol | 6 ++---- .../test-sol/unit/governance/network/Governance.t.sol | 6 ++---- .../unit/governance/validators/DowntimeSlasher.t.sol | 5 ++--- .../test-sol/unit/governance/validators/Validators.t.sol | 5 ++--- .../test-sol/unit/governance/voting/Election.t.sol | 5 ++--- .../test-sol/unit/governance/voting/LockedGold.t.sol | 4 ++-- .../test-sol/unit/governance/voting/ReleaseGold.t.sol | 4 ++-- packages/protocol/test-sol/unit/identity/Random.t.sol | 6 ++---- packages/protocol/test-sol/utils/WhenL2.sol | 4 ++-- 15 files changed, 30 insertions(+), 53 deletions(-) rename packages/protocol/test-sol/{utils.sol => testWithUtils.sol} (98%) diff --git a/packages/protocol/test-sol/devchain/migration/05Links.sol b/packages/protocol/test-sol/devchain/migration/05Links.sol index 4640cc6b9ab..86173233559 100644 --- a/packages/protocol/test-sol/devchain/migration/05Links.sol +++ b/packages/protocol/test-sol/devchain/migration/05Links.sol @@ -16,11 +16,8 @@ import "@celo-contracts/common/Registry.sol"; import "@celo-contracts/common/UniswapFeeHandlerSeller.sol"; import "@celo-contracts/common/MentoFeeHandlerSeller.sol"; -import "celo-foundry/Test.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; - -contract BlockchainParametersTest is Test, TestConstants, Utils { +contract BlockchainParametersTest is TestWithUtils { function test_dummy_test() public {} } diff --git a/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol b/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol index fe6220f60ce..959b0fb9745 100644 --- a/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol +++ b/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol @@ -2,8 +2,6 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import "celo-foundry/Test.sol"; - import "openzeppelin-solidity/contracts/math/SafeMath.sol"; import "@celo-contracts/common/FixidityLib.sol"; import "@celo-contracts/common/Registry.sol"; @@ -20,15 +18,14 @@ import "@celo-contracts/stability/test/MockStableToken.sol"; import "@celo-contracts/governance/Election.sol"; import "@celo-contracts/governance/Governance.sol"; -import { TestConstants } from "@test-sol/constants.sol"; import "@test-sol/utils/ECDSAHelper.sol"; -import { Utils } from "@test-sol/utils.sol"; -import { Test as ForgeTest } from "forge-std/Test.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; + import "@test-sol/unit/governance/validators/mocks/ValidatorsMockTunnel.sol"; import "@test-sol/unit/governance/voting/mocks/ReleaseGoldMockTunnel.sol"; import "@test-sol/unit/common/mocks/MockEpochManager.sol"; -contract RevokeCeloAfterL2Transition is Test, TestConstants, ECDSAHelper, Utils { +contract RevokeCeloAfterL2Transition is TestWithUtils, ECDSAHelper { using FixidityLib for FixidityLib.Fraction; uint256 constant TOTAL_AMOUNT = 1 ether * 1_000_000; diff --git a/packages/protocol/test-sol/utils.sol b/packages/protocol/test-sol/testWithUtils.sol similarity index 98% rename from packages/protocol/test-sol/utils.sol rename to packages/protocol/test-sol/testWithUtils.sol index 1776f491e7f..6fc2f8e24d3 100644 --- a/packages/protocol/test-sol/utils.sol +++ b/packages/protocol/test-sol/testWithUtils.sol @@ -10,7 +10,7 @@ import "@celo-contracts/governance/interfaces/IValidators.sol"; import "@celo-contracts-8/common/IsL2Check.sol"; import "@celo-contracts/common/PrecompilesOverrideV2.sol"; -contract Utils is Test, TestConstants, IsL2Check, PrecompilesOverrideV2 { +contract TestWithUtils is Test, TestConstants, IsL2Check, PrecompilesOverrideV2 { using EnumerableSet for EnumerableSet.AddressSet; EnumerableSet.AddressSet addressSet; diff --git a/packages/protocol/test-sol/unit/common/Accounts.t.sol b/packages/protocol/test-sol/unit/common/Accounts.t.sol index 0723af49f76..cdfdce20d92 100644 --- a/packages/protocol/test-sol/unit/common/Accounts.t.sol +++ b/packages/protocol/test-sol/unit/common/Accounts.t.sol @@ -2,16 +2,14 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import "celo-foundry/Test.sol"; import "@celo-contracts/common/FixidityLib.sol"; import "@celo-contracts/common/Accounts.sol"; import "@celo-contracts/governance/test/MockValidators.sol"; -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; -contract AccountsTest is Utils { +contract AccountsTest is TestWithUtils { using FixidityLib for FixidityLib.Fraction; Accounts accounts; diff --git a/packages/protocol/test-sol/unit/common/Proxy.t.sol b/packages/protocol/test-sol/unit/common/Proxy.t.sol index 72b48de78cb..cefb1ca8088 100644 --- a/packages/protocol/test-sol/unit/common/Proxy.t.sol +++ b/packages/protocol/test-sol/unit/common/Proxy.t.sol @@ -2,17 +2,14 @@ pragma solidity ^0.5.13; import "@celo-contracts/common/Proxy.sol"; -import "celo-foundry/Test.sol"; - -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@celo-contracts/common/test/GetSetV0.sol"; import "@celo-contracts/common/test/GetSetV1.sol"; import "@celo-contracts/common/test/HasInitializer.sol"; import "@celo-contracts/common/test/MsgSenderCheck.sol"; -contract ProxyTest is Test, TestConstants, Utils { +contract ProxyTest is TestWithUtils { Proxy proxy; GetSetV0 getSet; GetSetV0 proxiedGetSet; diff --git a/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol b/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol index 946351b494b..9514c951c8c 100644 --- a/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol @@ -2,12 +2,9 @@ pragma solidity ^0.5.13; import "@celo-contracts/governance/BlockchainParameters.sol"; -import "celo-foundry/Test.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; - -contract BlockchainParametersTest is Test, TestConstants, Utils { +contract BlockchainParametersTest is TestWithUtils { uint256 constant gasLimit = 7000000; uint256 constant gasForNonGoldCurrencies = 50000; address nonOwner; diff --git a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol index fcf7a551423..436116d4ddb 100644 --- a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.5.13; -import "celo-foundry/Test.sol"; import "@celo-contracts/common/Registry.sol"; import "@celo-contracts/common/Freezer.sol"; @@ -13,10 +12,9 @@ import { MockSortedOracles } from "@celo-contracts/stability/test/MockSortedOrac import { MockStableToken } from "@celo-contracts/stability/test/MockStableToken.sol"; import { GoldTokenMock } from "@test-sol/unit/common/GoldTokenMock.sol"; -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; -contract EpochRewardsTest is Test, TestConstants, Utils { +contract EpochRewardsTest is TestWithUtils { uint256 constant targetVotingYieldParamsInitial = 0.00016e24; // 0.00016 uint256 constant targetVotingYieldParamsMax = 0.0005e24; // 0.0005 uint256 constant targetVotingYieldParamsAdjustmentFactor = 1127990000000000000; // 0.00000112799 diff --git a/packages/protocol/test-sol/unit/governance/network/Governance.t.sol b/packages/protocol/test-sol/unit/governance/network/Governance.t.sol index efc69e0d0cc..baf8f3a19f3 100644 --- a/packages/protocol/test-sol/unit/governance/network/Governance.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/Governance.t.sol @@ -1,8 +1,6 @@ pragma solidity ^0.5.13; -import "celo-foundry/Test.sol"; -import { TestConstants } from "@test-sol/constants.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import "solidity-bytes-utils/contracts/BytesLib.sol"; @@ -59,7 +57,7 @@ contract GovernanceMock is Governance(true) { } } -contract GovernanceTest is Test, TestConstants, Utils { +contract GovernanceTest is TestWithUtils { using FixidityLib for FixidityLib.Fraction; using BytesLib for bytes; diff --git a/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol b/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol index 26c524368c2..29e54aa81ad 100644 --- a/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol +++ b/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol @@ -3,7 +3,6 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; import "celo-foundry/Test.sol"; -import { TestConstants } from "@test-sol/constants.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; import "@celo-contracts/common/FixidityLib.sol"; @@ -13,7 +12,7 @@ import "@celo-contracts/governance/test/MockValidators.sol"; import "@celo-contracts/governance/test/MockLockedGold.sol"; import "@celo-contracts/governance/DowntimeSlasher.sol"; import "@celo-contracts/governance/test/MockUsingPrecompiles.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; contract DowntimeSlasherMock is DowntimeSlasher(true), MockUsingPrecompiles, Test { struct SlashParams { @@ -77,7 +76,7 @@ contract DowntimeSlasherMock is DowntimeSlasher(true), MockUsingPrecompiles, Tes } } -contract DowntimeSlasherTest is Test, TestConstants, Utils { +contract DowntimeSlasherTest is TestWithUtils { using FixidityLib for FixidityLib.Fraction; using SafeMath for uint256; diff --git a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol index c30627de310..090305055ee 100644 --- a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol +++ b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol @@ -4,7 +4,6 @@ pragma experimental ABIEncoderV2; // This test file is in 0.5 although the contract is in 0.8 -import "celo-foundry/Test.sol"; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "openzeppelin-solidity/contracts/math/SafeMath.sol"; @@ -20,11 +19,11 @@ import "@celo-contracts/governance/test/MockLockedGold.sol"; import "@test-sol/unit/governance/validators/mocks/ValidatorsMockTunnel.sol"; import "@test-sol/utils/ECDSAHelper.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; -contract ValidatorsTest is Test, Utils, ECDSAHelper { +contract ValidatorsTest is TestWithUtils, ECDSAHelper { using FixidityLib for FixidityLib.Fraction; using SafeMath for uint256; diff --git a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol index 6e4fc539fbb..f038a9e4d9c 100644 --- a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol @@ -2,8 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import "celo-foundry/Test.sol"; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@celo-contracts/common/FixidityLib.sol"; import "@celo-contracts/common/Registry.sol"; @@ -30,7 +29,7 @@ contract ElectionMock is Election(true) { } } -contract ElectionTest is Utils { +contract ElectionTest is TestWithUtils { using FixidityLib for FixidityLib.Fraction; Accounts accounts; diff --git a/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol b/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol index c59fe6cc7d5..7fdc57b4cea 100644 --- a/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import "@celo-contracts/common/FixidityLib.sol"; @@ -18,7 +18,7 @@ import "@celo-contracts/governance/test/MockValidators.sol"; import { TestBlocker } from "@test-sol/unit/common/Blockable.t.sol"; -contract LockedGoldTest is Utils { +contract LockedGoldTest is TestWithUtils { using FixidityLib for FixidityLib.Fraction; Accounts accounts; diff --git a/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol b/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol index 06121cae4cd..c09ea4ee208 100644 --- a/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import { Utils } from "@test-sol/utils.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import { ECDSAHelper } from "@test-sol/utils/ECDSAHelper.sol"; @@ -23,7 +23,7 @@ import "@celo-contracts/governance/test/MockElection.sol"; import "@celo-contracts/governance/test/MockGovernance.sol"; import "@celo-contracts/governance/test/MockValidators.sol"; -contract ReleaseGoldTest is Utils, ECDSAHelper { +contract ReleaseGoldTest is TestWithUtils, ECDSAHelper { using FixidityLib for FixidityLib.Fraction; Accounts accounts; diff --git a/packages/protocol/test-sol/unit/identity/Random.t.sol b/packages/protocol/test-sol/unit/identity/Random.t.sol index 55ccf31dc20..73840899ae2 100644 --- a/packages/protocol/test-sol/unit/identity/Random.t.sol +++ b/packages/protocol/test-sol/unit/identity/Random.t.sol @@ -1,14 +1,12 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.5.13; -import "celo-foundry/Test.sol"; -import { Utils } from "@test-sol/utils.sol"; -import { TestConstants } from "@test-sol/constants.sol"; +import { TestWithUtils } from "@test-sol/testWithUtils.sol"; import "@celo-contracts/identity/Random.sol"; import "@celo-contracts/identity/test/RandomTest.sol"; -contract RandomTest_ is Test, TestConstants, IsL2Check, Utils { +contract RandomTest_ is TestWithUtils { RandomTest random; event RandomnessBlockRetentionWindowSet(uint256 value); diff --git a/packages/protocol/test-sol/utils/WhenL2.sol b/packages/protocol/test-sol/utils/WhenL2.sol index f5d32ef8982..20c0d580a3a 100644 --- a/packages/protocol/test-sol/utils/WhenL2.sol +++ b/packages/protocol/test-sol/utils/WhenL2.sol @@ -1,9 +1,9 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import "@test-sol/utils.sol"; +import "@test-sol/testWithUtils.sol"; -contract WhenL2 is Utils { +contract WhenL2 is TestWithUtils { function setUp() public { super.setUp(); whenL2WithEpochManagerInitialization(); From a9c0c29c5d9b3f786bf8656f03c359323211e237 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:37:13 -0500 Subject: [PATCH 2/5] capitalize --- packages/protocol/test-sol/devchain/migration/05Links.sol | 2 +- .../test-sol/integration/RevokeCeloAfterL2Transition.sol | 3 +-- packages/protocol/test-sol/unit/common/Accounts.t.sol | 2 +- packages/protocol/test-sol/unit/common/Proxy.t.sol | 2 +- .../unit/governance/network/BlockchainParameters.t.sol | 2 +- .../test-sol/unit/governance/network/EpochRewards.t.sol | 2 +- .../protocol/test-sol/unit/governance/network/Governance.t.sol | 2 +- .../test-sol/unit/governance/validators/DowntimeSlasher.t.sol | 2 +- .../test-sol/unit/governance/validators/Validators.t.sol | 2 +- .../protocol/test-sol/unit/governance/voting/Election.t.sol | 2 +- .../protocol/test-sol/unit/governance/voting/LockedGold.t.sol | 2 +- .../protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol | 2 +- packages/protocol/test-sol/unit/identity/Random.t.sol | 2 +- packages/protocol/test-sol/utils/WhenL2.sol | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/protocol/test-sol/devchain/migration/05Links.sol b/packages/protocol/test-sol/devchain/migration/05Links.sol index 86173233559..03ec70443db 100644 --- a/packages/protocol/test-sol/devchain/migration/05Links.sol +++ b/packages/protocol/test-sol/devchain/migration/05Links.sol @@ -16,7 +16,7 @@ import "@celo-contracts/common/Registry.sol"; import "@celo-contracts/common/UniswapFeeHandlerSeller.sol"; import "@celo-contracts/common/MentoFeeHandlerSeller.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; contract BlockchainParametersTest is TestWithUtils { function test_dummy_test() public {} diff --git a/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol b/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol index 959b0fb9745..d16c6001b30 100644 --- a/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol +++ b/packages/protocol/test-sol/integration/RevokeCeloAfterL2Transition.sol @@ -19,8 +19,7 @@ import "@celo-contracts/governance/Election.sol"; import "@celo-contracts/governance/Governance.sol"; import "@test-sol/utils/ECDSAHelper.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; - +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/unit/governance/validators/mocks/ValidatorsMockTunnel.sol"; import "@test-sol/unit/governance/voting/mocks/ReleaseGoldMockTunnel.sol"; import "@test-sol/unit/common/mocks/MockEpochManager.sol"; diff --git a/packages/protocol/test-sol/unit/common/Accounts.t.sol b/packages/protocol/test-sol/unit/common/Accounts.t.sol index cdfdce20d92..d28bc244889 100644 --- a/packages/protocol/test-sol/unit/common/Accounts.t.sol +++ b/packages/protocol/test-sol/unit/common/Accounts.t.sol @@ -6,7 +6,7 @@ import "@celo-contracts/common/FixidityLib.sol"; import "@celo-contracts/common/Accounts.sol"; import "@celo-contracts/governance/test/MockValidators.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; contract AccountsTest is TestWithUtils { diff --git a/packages/protocol/test-sol/unit/common/Proxy.t.sol b/packages/protocol/test-sol/unit/common/Proxy.t.sol index cefb1ca8088..b8e105eaee2 100644 --- a/packages/protocol/test-sol/unit/common/Proxy.t.sol +++ b/packages/protocol/test-sol/unit/common/Proxy.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; import "@celo-contracts/common/Proxy.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@celo-contracts/common/test/GetSetV0.sol"; import "@celo-contracts/common/test/GetSetV1.sol"; diff --git a/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol b/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol index 9514c951c8c..ebee8644d3d 100644 --- a/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/BlockchainParameters.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; import "@celo-contracts/governance/BlockchainParameters.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; contract BlockchainParametersTest is TestWithUtils { uint256 constant gasLimit = 7000000; diff --git a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol index 436116d4ddb..00eea1be8b5 100644 --- a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol @@ -12,7 +12,7 @@ import { MockSortedOracles } from "@celo-contracts/stability/test/MockSortedOrac import { MockStableToken } from "@celo-contracts/stability/test/MockStableToken.sol"; import { GoldTokenMock } from "@test-sol/unit/common/GoldTokenMock.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; contract EpochRewardsTest is TestWithUtils { uint256 constant targetVotingYieldParamsInitial = 0.00016e24; // 0.00016 diff --git a/packages/protocol/test-sol/unit/governance/network/Governance.t.sol b/packages/protocol/test-sol/unit/governance/network/Governance.t.sol index baf8f3a19f3..ee4a8284cc3 100644 --- a/packages/protocol/test-sol/unit/governance/network/Governance.t.sol +++ b/packages/protocol/test-sol/unit/governance/network/Governance.t.sol @@ -1,6 +1,6 @@ pragma solidity ^0.5.13; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import "solidity-bytes-utils/contracts/BytesLib.sol"; diff --git a/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol b/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol index 29e54aa81ad..35416ebe177 100644 --- a/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol +++ b/packages/protocol/test-sol/unit/governance/validators/DowntimeSlasher.t.sol @@ -12,7 +12,7 @@ import "@celo-contracts/governance/test/MockValidators.sol"; import "@celo-contracts/governance/test/MockLockedGold.sol"; import "@celo-contracts/governance/DowntimeSlasher.sol"; import "@celo-contracts/governance/test/MockUsingPrecompiles.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; contract DowntimeSlasherMock is DowntimeSlasher(true), MockUsingPrecompiles, Test { struct SlashParams { diff --git a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol index 090305055ee..9183fbd6692 100644 --- a/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol +++ b/packages/protocol/test-sol/unit/governance/validators/Validators.t.sol @@ -19,7 +19,7 @@ import "@celo-contracts/governance/test/MockLockedGold.sol"; import "@test-sol/unit/governance/validators/mocks/ValidatorsMockTunnel.sol"; import "@test-sol/utils/ECDSAHelper.sol"; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; diff --git a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol index f038a9e4d9c..3a58b4a26f8 100644 --- a/packages/protocol/test-sol/unit/governance/voting/Election.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/Election.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@celo-contracts/common/FixidityLib.sol"; import "@celo-contracts/common/Registry.sol"; diff --git a/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol b/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol index 7fdc57b4cea..8c70a1940f6 100644 --- a/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/LockedGold.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import "@celo-contracts/common/FixidityLib.sol"; diff --git a/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol b/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol index c09ea4ee208..f29213431a5 100644 --- a/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol +++ b/packages/protocol/test-sol/unit/governance/voting/ReleaseGold.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@test-sol/utils/WhenL2.sol"; import { ECDSAHelper } from "@test-sol/utils/ECDSAHelper.sol"; diff --git a/packages/protocol/test-sol/unit/identity/Random.t.sol b/packages/protocol/test-sol/unit/identity/Random.t.sol index 73840899ae2..3a6b33eb0c2 100644 --- a/packages/protocol/test-sol/unit/identity/Random.t.sol +++ b/packages/protocol/test-sol/unit/identity/Random.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.5.13; -import { TestWithUtils } from "@test-sol/testWithUtils.sol"; +import { TestWithUtils } from "@test-sol/TestWithUtils.sol"; import "@celo-contracts/identity/Random.sol"; import "@celo-contracts/identity/test/RandomTest.sol"; diff --git a/packages/protocol/test-sol/utils/WhenL2.sol b/packages/protocol/test-sol/utils/WhenL2.sol index 20c0d580a3a..3891956e13e 100644 --- a/packages/protocol/test-sol/utils/WhenL2.sol +++ b/packages/protocol/test-sol/utils/WhenL2.sol @@ -1,7 +1,7 @@ pragma solidity ^0.5.13; pragma experimental ABIEncoderV2; -import "@test-sol/testWithUtils.sol"; +import "@test-sol/TestWithUtils.sol"; contract WhenL2 is TestWithUtils { function setUp() public { From 8d100611f5f8aea4b2f0f9cc6e705dc8a6af9f5c Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:14:37 -0500 Subject: [PATCH 3/5] =?UTF-8?q?fixed=20=E2=88=86=20from=20merge=20conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/protocol/test-sol/unit/common/GoldToken.t.sol | 4 ++-- .../test-sol/unit/governance/network/EpochRewards.t.sol | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/protocol/test-sol/unit/common/GoldToken.t.sol b/packages/protocol/test-sol/unit/common/GoldToken.t.sol index c0f34013d93..8d3cbf9cb64 100644 --- 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 index d7fd8904406..8aaf7177457 100644 --- 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 From 0cbe99d20e0d72ae574c8948353884254c04f336 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:35:32 -0500 Subject: [PATCH 4/5] name not updating --- .../protocol/test-sol/{testWithUtils.sol => TestWithUtil.sol} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/protocol/test-sol/{testWithUtils.sol => TestWithUtil.sol} (100%) diff --git a/packages/protocol/test-sol/testWithUtils.sol b/packages/protocol/test-sol/TestWithUtil.sol similarity index 100% rename from packages/protocol/test-sol/testWithUtils.sol rename to packages/protocol/test-sol/TestWithUtil.sol From c643f3f561c76ea2af2623337dd3b7371d7791dd Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:36:01 -0500 Subject: [PATCH 5/5] re-updated name --- .../protocol/test-sol/{TestWithUtil.sol => TestWithUtils.sol} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/protocol/test-sol/{TestWithUtil.sol => TestWithUtils.sol} (100%) diff --git a/packages/protocol/test-sol/TestWithUtil.sol b/packages/protocol/test-sol/TestWithUtils.sol similarity index 100% rename from packages/protocol/test-sol/TestWithUtil.sol rename to packages/protocol/test-sol/TestWithUtils.sol