replace labelThisThread from MonadFork with labelMyThread from Hydra.Prelude

Author: ffakenz

hydra-node/test/Hydra/Model.hs

@@ -27,7 +27,6 @@ import Control.Concurrent.Class.MonadSTM (
   readTVarIO,
  )
 import Control.Monad.Class.MonadAsync (async, cancel, link)
-import Control.Monad.Class.MonadFork (labelThisThread)
 import Data.List (nub, (\\))
 import Data.List qualified as List
 import Data.Map ((!))
@@ -667,7 +666,7 @@ seedWorld seedKeys seedCP futureCommits = do
           seedCP
           testDepositPeriod
       let testClient = createTestHydraClient outputs messages outputHistory node
-      nodeThread <- async $ labelThisThread ("node-" <> shortLabel hsk) >> runHydraNode node
+      nodeThread <- async $ labelMyThread ("node-" <> shortLabel hsk) >> runHydraNode node
       link nodeThread
       pure (testClient, nodeThread)
     pushThread nodeThread

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

@@ -17,7 +17,6 @@ import Control.Concurrent.Class.MonadSTM (
   writeTVar,
  )
 import Control.Monad.Class.MonadAsync (async, link)
-import Control.Monad.Class.MonadFork (labelThisThread)
 import Data.Sequence (Seq (Empty, (:|>)))
 import Data.Sequence qualified as Seq
 import Data.Time (secondsToNominalDiffTime)
@@ -103,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 (labelThisThread "chain" >> simulateChain nodes chain queue)
+  tickThread <- async (labelMyThread "chain" >> simulateChain nodes chain queue)
   link tickThread
   pure
     SimulatedChainNetwork

hydra-prelude/src/Hydra/Prelude.hs

@@ -73,7 +73,7 @@ import Control.Monad.Class.MonadAsync (
 import Control.Monad.Class.MonadEventlog (
   MonadEventlog,
  )
-import Control.Monad.Class.MonadFork (MonadFork, MonadThread, labelThread, myThreadId)
+import Control.Monad.Class.MonadFork (MonadFork, MonadThread, labelThread, myThreadId, labelThisThread)
 import Control.Monad.Class.MonadST (
   MonadST,
  )
@@ -350,7 +350,7 @@ newLabelledTBQueueIO = (atomically .) . newLabelledTBQueue
 -- * Helpers for labeling Threads
 
 labelMyThread :: MonadThread m => String -> m ()
-labelMyThread lbl = myThreadId >>= flip labelThread lbl
+labelMyThread = labelThisThread
 
 raceLabelled :: (MonadThread m, MonadAsync m) => (String, m a) -> (String, m b) -> m (Either a b)
 raceLabelled (lblA, mA) (lblB, mB) =