fixing compilation

celo-org · Dec 20, 2024 · 4a2c7f7 · 4a2c7f7
1 parent 75d40e9
commit 4a2c7f7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/packages/protocol/test-sol/constants.sol b/packages/protocol/test-sol/constants.sol
@@ -6,10 +6,13 @@ contract TestConstants {
   uint256 public constant FIXED1 = 1e24;
   uint256 public constant MINUTE = 60;
   uint256 public constant HOUR = 60 * MINUTE;
-  uint256 public constant DAY = 24 * HOUR;
-  uint256 public constant MONTH = 30 * DAY;
-  uint256 constant WEEK = 7 * DAY;
-  uint256 public constant YEAR = 365 * DAY;
+  // uint256 public constant DAY = 24 * HOUR;
+  uint256 public constant MONTH = 30 * 86400;
+  // uint256 public constant MONTH = 30 * DAY;
+  uint256 constant WEEK = 7 * 86400;
+  // uint256 constant WEEK = 7 * DAY;
+  uint256 public constant YEAR = 365 * 86400;
+  // uint256 public constant YEAR = 365 * DAY;
   uint256 public constant L2_BLOCK_IN_EPOCH = 43200;
 
   // Contract names

diff --git a/packages/protocol/test-sol/unit/common/FeeCurrencyDirectory.t.sol b/packages/protocol/test-sol/unit/common/FeeCurrencyDirectory.t.sol
@@ -15,7 +15,7 @@ contract FeeCurrencyDirectoryTest is Utils08 {
   event CurrencyConfigSet(address indexed token, address indexed oracle, uint256 intrinsicGas);
   event CurrencyRemoved(address indexed token);
 
-  function setUp() public virtual {
+  function setUp() public virtual override {
     super.setUp();
     owner = address(this);
     nonOwner = actor("nonOwner");
@@ -26,7 +26,11 @@ contract FeeCurrencyDirectoryTest is Utils08 {
   }
 }
 
-contract FeeCurrencyDirectoryTest_L2 is FeeCurrencyDirectoryTest, WhenL2 {}
+contract FeeCurrencyDirectoryTest_L2 is FeeCurrencyDirectoryTest, WhenL2 {
+  function setUp() public override(FeeCurrencyDirectoryTest, WhenL2) {
+    super.setUp();
+  }
+}
 
 contract TestSetCurrencyConfig is FeeCurrencyDirectoryTest {
   function test_ShouldAllowOwnerSetCurrencyConfig() public {

diff --git a/packages/protocol/test-sol/unit/common/ProxyFactory08.t.sol b/packages/protocol/test-sol/unit/common/ProxyFactory08.t.sol
@@ -11,7 +11,8 @@ contract ProxyFactoryTest is Utils08 {
   bytes proxyInitCode;
   address constant owner = address(0xAA963FC97281d9632d96700aB62A4D1340F9a28a);
 
-  function setUp() public {
+  function setUp() public override {
+    super.setUp();
     proxyFactory08 = new ProxyFactory08();
     proxyInitCode = vm.getCode("Proxy.sol");
   }

diff --git a/packages/protocol/test-sol/utils/WhenL2-08.sol b/packages/protocol/test-sol/utils/WhenL2-08.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 import "@test-sol/utils08.sol";
 
 contract WhenL2 is Utils08 {
-  function setUp() public {
+  function setUp() public virtual override {
     super.setUp();
     whenL2WithEpochManagerInitialization();
   }