fixing tests

celo-org · Sep 17, 2024 · 10da453 · 10da453
1 parent 37bcae1
commit 10da453
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/packages/protocol/test-sol/constants.sol b/packages/protocol/test-sol/constants.sol
@@ -25,6 +25,7 @@ contract TestConstants {
   string constant GovernanceContract = "Governance";
   string constant EpochRewardsContract = "EpochRewards";
   string constant EpochManagerContract = "EpochManager";
+  string constant EpochManagerEnablerContract = "EpochManagerEnabler";
   string constant ScoreManagerContract = "ScoreManager";
   string constant ReserveContract = "Reserve";
   string constant CeloUnreleasedTreasureContract = "CeloUnreleasedTreasure";

diff --git a/packages/protocol/test-sol/devchain/e2e/common/EpochManager.t.sol b/packages/protocol/test-sol/devchain/e2e/common/EpochManager.t.sol
@@ -98,7 +98,7 @@ contract E2E_EpochManager_InitializeSystem is E2E_EpochManager {
   }
 
   function test_shouldRevert_WhenCalledByNonEnabler() public {
-    vm.expectRevert("msg.sender is not Initializer");
+    vm.expectRevert("msg.sender is not Enabler");
     epochManager.initializeSystem(1, 1, firstElected);
   }
 

diff --git a/packages/protocol/test-sol/devchain/migration/Migration.t.sol b/packages/protocol/test-sol/devchain/migration/Migration.t.sol
@@ -233,18 +233,6 @@ contract EpochManagerIntegrationTest is IntegrationTest, MigrationsConstants {
     }
   }
 
-  function test_IsSetupCorrect() public {
-    assertEq(
-      registry.getAddressForStringOrDie("EpochManagerEnabler"),
-      epochManager.epochManagerEnabler()
-    );
-    assertEq(
-      registry.getAddressForStringOrDie("EpochManagerEnabler"),
-      address(epochManagerEnabler)
-    );
-    assertEq(address(epochManagerEnabler), epochManager.epochManagerEnabler());
-  }
-
   function test_Reverts_whenSystemNotInitialized() public {
     vm.expectRevert("Epoch system not initialized");
     epochManager.startNextEpochProcess();

diff --git a/packages/protocol/test-sol/unit/common/EpochManager.t.sol b/packages/protocol/test-sol/unit/common/EpochManager.t.sol
@@ -79,6 +79,7 @@ contract EpochManagerTest is Test, TestConstants, Utils08 {
     scoreManager = ScoreManager(scoreManagerAddress);
 
     registry.setAddressFor(EpochManagerContract, address(epochManager));
+    registry.setAddressFor(EpochManagerEnablerContract, epochManagerEnabler);
     registry.setAddressFor(SortedOraclesContract, address(sortedOracles));
     registry.setAddressFor(GovernanceContract, communityRewardFund);
     registry.setAddressFor(EpochRewardsContract, address(epochRewards));
@@ -137,7 +138,7 @@ contract EpochManagerTest_initializeSystem is EpochManagerTest {
       uint256 _startTimestamp,
       uint256 _currentRewardsBlock
     ) = epochManager.getCurrentEpoch();
-    assertEq(epochManager.epochManagerEnabler(), address(0));
+    assertGt(epochManager.getElected().length, 0);
     assertEq(epochManager.firstKnownEpoch(), firstEpochNumber);
     assertEq(_firstEpochBlock, firstEpochBlock);
     assertEq(_lastEpochBlock, 0);
@@ -149,13 +150,13 @@ contract EpochManagerTest_initializeSystem is EpochManagerTest {
   function test_Reverts_processCannotBeStartedAgain() public virtual {
     vm.prank(epochManagerEnabler);
     epochManager.initializeSystem(firstEpochNumber, firstEpochBlock, firstElected);
-    vm.prank(address(0));
+    vm.prank(epochManagerEnabler);
     vm.expectRevert("Epoch system already initialized");
     epochManager.initializeSystem(firstEpochNumber, firstEpochBlock, firstElected);
   }
 
   function test_Reverts_WhenSystemInitializedByOtherContract() public virtual {
-    vm.expectRevert("msg.sender is not Initializer");
+    vm.expectRevert("msg.sender is not Enabler");
     epochManager.initializeSystem(firstEpochNumber, firstEpochBlock, firstElected);
   }
 }