From 937b55549b4ba72b0392d7e139e592a40eec2101 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 27 Apr 2017 09:39:55 -0400
Subject: rename LogMessage to AnyMessage

Not related to the Log anymore.
---
 Role/Developer.hs  | 12 ++++++------
 Role/Downloader.hs |  2 +-
 Role/User.hs       |  2 +-
 Role/Watcher.hs    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Role')

diff --git a/Role/Developer.hs b/Role/Developer.hs
index d5c3463..a0e178e 100644
--- a/Role/Developer.hs
+++ b/Role/Developer.hs
@@ -25,13 +25,13 @@ import Data.Time.Clock.POSIX
 run :: DeveloperOpts -> IO ()
 run = run' developer . debugUrl
 
-run' :: (TMChan (Message Entered) -> TMChan LogMessage -> SessionID -> IO ()) -> UrlString -> IO ()
+run' :: (TMChan (Message Entered) -> TMChan AnyMessage -> SessionID -> IO ()) -> UrlString -> IO ()
 run' runner url = void $ runClientApp app
   where
 	connect = ConnectMode (T.pack url)
 	app = clientApp connect Developer Just runner
 
-developer :: TMChan (Message Entered) -> TMChan LogMessage -> SessionID -> IO ()
+developer :: TMChan (Message Entered) -> TMChan AnyMessage -> SessionID -> IO ()
 developer ichan ochan _ = withLogger "debug-me-developer.log" $ \logger -> do
 	(devstate, startoutput) <- processSessionStart ochan logger
 	emitOutput startoutput
@@ -103,7 +103,7 @@ sendTtyInput ichan devstate logger = go
 		go
 
 -- | Read activity from the TMChan and display it to the developer.
-sendTtyOutput :: TMChan LogMessage -> TVar DeveloperState -> Logger -> IO ()
+sendTtyOutput :: TMChan AnyMessage -> TVar DeveloperState -> Logger -> IO ()
 sendTtyOutput ochan devstate logger = go
   where
 	go = do
@@ -119,7 +119,7 @@ sendTtyOutput ochan devstate logger = go
 -- | Present our session key to the user. 
 -- Wait for them to accept or reject it, while displaying any Seen data
 -- in the meantime.
-authUser :: TMChan (Message Entered) -> TMChan LogMessage -> TVar DeveloperState -> Logger -> IO Bool
+authUser :: TMChan (Message Entered) -> TMChan AnyMessage -> TVar DeveloperState -> Logger -> IO Bool
 authUser ichan ochan devstate logger = do
 	ds <- atomically $ readTVar devstate
 	spk <- myPublicKey (developerSessionKey ds) (GpgSign True)
@@ -167,7 +167,7 @@ emitOutput NoOutput =
 
 -- | Get messages from server, check their signature, and make sure that they
 -- are properly chained from past messages, before returning.
-getServerMessage :: TMChan LogMessage -> TVar DeveloperState -> POSIXTime -> STM (Maybe (Output, LogMessage))
+getServerMessage :: TMChan AnyMessage -> TVar DeveloperState -> POSIXTime -> STM (Maybe (Output, AnyMessage))
 getServerMessage ochan devstate ts = do
 	let ignore = getServerMessage ochan devstate ts
 	mmsg <- readTMChan ochan
@@ -288,7 +288,7 @@ isLegalSeen act@(Activity (Seen (Val b)) (Just hp) _ _) ds ts
 
 -- | Start by reading the initial two messages from the user,
 -- their session key and the startup message.
-processSessionStart :: TMChan LogMessage -> Logger -> IO (TVar DeveloperState, Output)
+processSessionStart :: TMChan AnyMessage -> Logger -> IO (TVar DeveloperState, Output)
 processSessionStart ochan logger = do
 	sessionmsg <- fromMaybe (error "Did not get session initialization message")
 		<$> atomically (readTMChan ochan)
diff --git a/Role/Downloader.hs b/Role/Downloader.hs
index 243410b..d49b4ec 100644
--- a/Role/Downloader.hs
+++ b/Role/Downloader.hs
@@ -13,7 +13,7 @@ import Data.Time.Clock.POSIX
 run :: DownloadOpts -> IO ()
 run = run' downloader . downloadUrl
 
-downloader :: TMChan (Message Entered) -> TMChan LogMessage -> SessionID -> IO ()
+downloader :: TMChan (Message Entered) -> TMChan AnyMessage -> SessionID -> IO ()
 downloader _ichan ochan sid = do
 	let logfile = sessionLogFile "." sid
 	putStrLn $ "Starting download to " ++ logfile
diff --git a/Role/User.hs b/Role/User.hs
index 51688af..be546cf 100644
--- a/Role/User.hs
+++ b/Role/User.hs
@@ -54,7 +54,7 @@ run os = fromMaybe (ExitFailure 101) <$> connect
 			_ <- waitCatch p2
 			return exitstatus
 
-developerMessages :: LogMessage -> Maybe (Message Entered)
+developerMessages :: AnyMessage -> Maybe (Message Entered)
 developerMessages (Developer m) = Just m
 developerMessages (User _) = Nothing
 
diff --git a/Role/Watcher.hs b/Role/Watcher.hs
index 1ca0ae7..8bcc91c 100644
--- a/Role/Watcher.hs
+++ b/Role/Watcher.hs
@@ -14,7 +14,7 @@ import Data.Time.Clock.POSIX
 run :: WatchOpts -> IO ()
 run = run' watcher . watchUrl
 
-watcher :: TMChan (Message Entered) -> TMChan LogMessage -> SessionID -> IO ()
+watcher :: TMChan (Message Entered) -> TMChan AnyMessage -> SessionID -> IO ()
 watcher _ichan ochan _ = inRawMode $ do
 	(st, startoutput) <- processSessionStart ochan nullLogger
 	emitOutput startoutput
-- 
cgit v1.2.3