consensus: change onEachTick to tickWatcher

This commit is propagating the new Watcher abstraction through an abbreviation.

ouroboros-consensus-test/src/Test/Util/LogicalClock.hs

@@ -16,7 +16,7 @@ module Test.Util.LogicalClock (
   , new
   , sufficientTimeFor
     -- * Scheduling actions
-  , onEachTick
+  , tickWatcher
   , onTick
   , blockUntilTick
   ) where
@@ -83,22 +83,16 @@ tickDelay = 0.5
 -------------------------------------------------------------------------------}
 
 -- | Execute action on every clock tick
---
--- Returns a handle to cancel the thread.
-onEachTick :: (IOLike m, HasCallStack)
-           => ResourceRegistry m
-           -> LogicalClock m
-           -> String
-           -> (Tick -> m ())
-           -> m (m ())
-onEachTick registry clock threadLabel action =
-    cancelThread <$>
-      forkLinkedWatcher registry threadLabel Watcher {
-            wFingerprint = id
-          , wInitial     = Nothing
-          , wNotify      = action
-          , wReader      = getCurrentTick clock
-          }
+tickWatcher :: LogicalClock m
+            -> (Tick -> m ())
+            -> Watcher m Tick Tick
+tickWatcher clock action =
+    Watcher {
+        wFingerprint = id
+      , wInitial     = Nothing
+      , wNotify      = action
+      , wReader      = getCurrentTick clock
+      }
 
 -- | Execute action once at the specified tick
 onTick :: (IOLike m, HasCallStack)

ouroboros-consensus-test/test-consensus/Test/Consensus/MiniProtocol/ChainSync/Client.hs

@@ -62,7 +62,7 @@ import           Ouroboros.Consensus.Util.Condense
 import           Ouroboros.Consensus.Util.IOLike
 import           Ouroboros.Consensus.Util.ResourceRegistry
 import           Ouroboros.Consensus.Util.STM (Fingerprint (..),
-                     WithFingerprint (..))
+                     WithFingerprint (..), forkLinkedWatcher)
 
 import           Test.Util.LogicalClock (LogicalClock, NumTicks (..), Tick (..))
 import qualified Test.Util.LogicalClock as LogicalClock
@@ -305,7 +305,12 @@ runChainSync securityParam (ClientUpdates clientUpdates)
 
     -- Schedule updates of the client and server chains
     varLastUpdate <- uncheckedNewTVarM 0
-    void $ LogicalClock.onEachTick registry clock "scheduled updates" $ \tick -> do
+    let forkLinkedTickWatcher :: (Tick -> m ()) -> m ()
+        forkLinkedTickWatcher =
+              void
+            . forkLinkedWatcher registry "scheduled updates"
+            . LogicalClock.tickWatcher clock
+    forkLinkedTickWatcher $ \tick -> do
       -- Stop updating the client and server chains when the chain sync client
       -- has thrown an exception or has gracefully terminated, so that at the
       -- end, we can read the chains in the states they were in when the