replace labelMyThread with labelThisThread

Author: ffakenz

hydra-node/test/Hydra/Model.hs

@@ -666,7 +666,7 @@ seedWorld seedKeys seedCP futureCommits = do
           seedCP
           testDepositPeriod
       let testClient = createTestHydraClient outputs messages outputHistory node
-      nodeThread <- async $ labelMyThread ("node-" <> shortLabel hsk) >> runHydraNode node
+      nodeThread <- async $ labelThisThread ("node-" <> shortLabel hsk) >> runHydraNode node
       link nodeThread
       pure (testClient, nodeThread)
     pushThread nodeThread

hydra-node/test/Hydra/Model/MockChain.hs

@@ -102,7 +102,7 @@ mockChainAndNetwork tr seedKeys commits = do
   nodes <- newLabelledTVarIO "nodes" []
   queue <- newLabelledTQueueIO "chain-queue"
   chain <- newLabelledTVarIO "mock-chain-state" (0 :: ChainSlot, 0 :: Natural, Empty, initialUTxO)
-  tickThread <- async (labelMyThread "chain" >> simulateChain nodes chain queue)
+  tickThread <- async (labelThisThread "chain" >> simulateChain nodes chain queue)
   link tickThread
   pure
     SimulatedChainNetwork

hydra-prelude/src/Hydra/Prelude.hs

@@ -351,26 +351,23 @@ newLabelledTBQueueIO = (atomically .) . newLabelledTBQueue
 
 -- * Helpers for labeling Threads
 
-labelMyThread :: MonadThread m => String -> m ()
-labelMyThread = labelThisThread
-
 raceLabelled :: (MonadThread m, MonadAsync m) => (String, m a) -> (String, m b) -> m (Either a b)
 raceLabelled (lblA, mA) (lblB, mB) =
   race
-    (labelMyThread lblA >> mA)
-    (labelMyThread lblB >> mB)
+    (labelThisThread lblA >> mA)
+    (labelThisThread lblB >> mB)
 
 raceLabelled_ :: (MonadThread m, MonadAsync m) => (String, m a) -> (String, m b) -> m ()
 raceLabelled_ = (void .) . raceLabelled
 
 withAsyncLabelled :: MonadAsync m => (String, m a) -> (Async m a -> m b) -> m b
-withAsyncLabelled (lbl, ma) = withAsync (labelMyThread lbl >> ma)
+withAsyncLabelled (lbl, ma) = withAsync (labelThisThread lbl >> ma)
 
 concurrentlyLabelled :: (MonadThread m, MonadAsync m) => (String, m a) -> (String, m b) -> m (a, b)
 concurrentlyLabelled (lblA, mA) (lblB, mB) =
   concurrently
-    (labelMyThread lblA >> mA)
-    (labelMyThread lblB >> mB)
+    (labelThisThread lblA >> mA)
+    (labelThisThread lblB >> mB)
 
 concurrentlyLabelled_ :: (MonadThread m, MonadAsync m) => (String, m a) -> (String, m b) -> m ()
 concurrentlyLabelled_ = (void .) . concurrentlyLabelled