Improve readability of leadership check

IntersectMBO · Jan 5, 2023 · 3141ca1 · 3141ca1
1 parent bd2d757
commit 3141ca1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/cardano-testnet/test/Test/Cli/Alonzo/LeadershipSchedule.hs b/cardano-testnet/test/Test/Cli/Alonzo/LeadershipSchedule.hs
@@ -504,12 +504,13 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
   leadershipDeadline <- H.noteShowM $ DTC.addUTCTime 90 <$> H.noteShowIO DTC.getCurrentTime
 
-  H.byDeadlineM 10 leadershipDeadline "Wait for a leadership at least as new as the highest one we expect" $ do
-    leaderSlots <- H.getRelevantLeaderSlots (TR.nodeStdout $ TR.poolRuntime poolNode1) (minimum expectedLeadershipSlotNumbers)
-    maxActualSlot <- H.noteShow $ maximum leaderSlots
+  -- We need enough time to pass such that the expected leadership slots generated by the
+  -- leadership-schedule command have actually occurred.
+  leaderSlots <- H.byDeadlineM 10 leadershipDeadline "Wait for chain to surpass all expected leadership slots" $ do
+    someLeaderSlots <- H.getRelevantLeaderSlots (TR.nodeStdout $ TR.poolRuntime poolNode1) (minimum expectedLeadershipSlotNumbers)
+    maxActualSlot <- H.noteShow $ maximum someLeaderSlots
     H.assert $ maxActualSlot >= maxSlotExpected
-
-  leaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
+    pure someLeaderSlots
 
   -- It's possible for some slots to not be assigned in TPraos when BFT nodes are running.
   -- TODO Remove BFT nodes from testnet and assert the schedule is equal to actual slots

diff --git a/cardano-testnet/test/Test/Cli/Babbage/LeadershipSchedule.hs b/cardano-testnet/test/Test/Cli/Babbage/LeadershipSchedule.hs
@@ -137,16 +137,16 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipDeadline <- H.noteShowM $ DTC.addUTCTime 90 <$> H.noteShowIO DTC.getCurrentTime
 
-    -- Retrieve actual slots
-    H.byDeadlineM 10 leadershipDeadline "Wait for a leadership at least as new as the highest one we expect" $ do
-      leaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
-      if L.null leaderSlots
+    -- We need enough time to pass such that the expected leadership slots generated by the
+    -- leadership-schedule command have actually occurred.
+    leaderSlots <- H.byDeadlineM 10 leadershipDeadline "Wait for chain to surpass all expected leadership slots" $ do
+      someLeaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
+      if L.null someLeaderSlots
         then H.failure
         else do
-          maxActualSlot <- H.noteShow $ maximum leaderSlots
+          maxActualSlot <- H.noteShow $ maximum someLeaderSlots
           H.assert $ maxActualSlot >= maxSlotExpected
-
-    leaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
+          pure someLeaderSlots
 
     H.noteShow_ expectedLeadershipSlotNumbers
     H.noteShow_ leaderSlots
@@ -179,15 +179,16 @@ hprop_leadershipSchedule = H.integration . H.runFinallies . H.workspace "alonzo"
 
     leadershipDeadline <- H.noteShowM $ DTC.addUTCTime 90 <$> H.noteShowIO DTC.getCurrentTime
 
-    H.byDeadlineM 10 leadershipDeadline "Wait for a leadership at least as new as the highest one we expect" $ do
-      leaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
-      if L.null leaderSlots
+    -- We need enough time to pass such that the expected leadership slots generated by the
+    -- leadership-schedule command have actually occurred.
+    leaderSlots <- H.byDeadlineM 10 leadershipDeadline "Wait for chain to surpass all expected leadership slots" $ do
+      someLeaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
+      if L.null someLeaderSlots
         then H.failure
         else do
-          maxActualSlot <- H.noteShow $ maximum leaderSlots
+          maxActualSlot <- H.noteShow $ maximum someLeaderSlots
           H.assert $ maxActualSlot >= maxSlotExpected
-
-    leaderSlots <- H.getRelevantLeaderSlots (TR.poolNodeStdout poolNode1) (minimum expectedLeadershipSlotNumbers)
+      pure someLeaderSlots
 
     H.noteShow_ expectedLeadershipSlotNumbers
     H.noteShow_ leaderSlots