Apply suggestions from code review

Co-authored-by: Derek Pierre <[email protected]>
derekpierre · Jun 27, 2024 · 3886874 · 3886874
1 parent 39d5678
commit 3886874
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/contracts/contracts/coordination/Coordinator.sol b/contracts/contracts/coordination/Coordinator.sol
@@ -43,7 +43,7 @@ contract Coordinator is Initializable, AccessControlDefaultAdminRulesUpgradeable
         BLS12381.G2Point publicKey
     );
     event FeeModelApproved(IFeeModel feeModel);
-    event RitualExtended(uint32 indexed ritualId, uint32 indexed duration);
+    event RitualExtended(uint32 indexed ritualId, uint32 endTimestamp);
 
     enum RitualState {
         NON_INITIATED,
@@ -577,6 +577,6 @@ contract Coordinator is Initializable, AccessControlDefaultAdminRulesUpgradeable
             ritual.participant.length,
             duration
         );
-        emit RitualExtended(ritualId, duration);
+        emit RitualExtended(ritualId, ritual.endTimestamp);
     }
 }
diff --git a/contracts/contracts/coordination/subscription/BqETHSubscription.sol b/contracts/contracts/coordination/subscription/BqETHSubscription.sol
@@ -253,7 +253,7 @@ contract BqETHSubscription is EncryptorSlotsSubscription, Initializable, Ownable
                 state == Coordinator.RitualState.DKG_INVALID ||
                     state == Coordinator.RitualState.DKG_TIMEOUT ||
                     state == Coordinator.RitualState.EXPIRED, // TODO check if it's ok
-                "Only failed rituals allowed to be reinitiated"
+                "Only failed/expired rituals allowed to be reinitiated"
             );
         }
         activeRitualId = ritualId;

diff --git a/tests/test_bqeth_subscription.py b/tests/test_bqeth_subscription.py
@@ -390,7 +390,7 @@ def test_process_ritual_payment(
     coordinator.setRitual(
         new_ritual_id, RitualState.ACTIVE, 0, global_allow_list.address, sender=treasury
     )
-    with ape.reverts("Only failed rituals allowed to be reinitiated"):
+    with ape.reverts("Only failed/expired rituals allowed to be reinitiated"):
         coordinator.processRitualPayment(
             adopter, new_ritual_id, number_of_providers, DURATION, sender=treasury
         )